[Tokyodebian-commits] Tokyo area Debian meeting resources.: Changes to 'master'

[Junichi Uekawa]

 image200905/quiz.tex |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

New commits:
commit 9d575397a277a721ac9b2ddb269b73f00db22aac
Merge: da8710974812fab8370783536bb25dd8e5912677 4af4b5552335dd9593f1c42e451b1f0497b6f715
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri May 22 00:03:09 2009 +0900

    Merge branch 'quiz-prepare'

commit 4af4b5552335dd9593f1c42e451b1f0497b6f715
Merge: 154c793d2ad28d994b202eb74d989fe3b63e76b3 b5dcbec068218f8da7af347eb1473bbc7b1191f2
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sat May 16 17:27:59 2009 +0900

    Merge branch 'master' into quiz-prepare
    
    Conflicts:
    	image200905/quiz.tex

commit 154c793d2ad28d994b202eb74d989fe3b63e76b3
Merge: a453afa10274e0ba045b1026f92a0cddbf9e1782 b65b26d6c180123682f73f8b6928ab269c0ecd3c
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sat May 16 01:13:57 2009 +0900

    Merge branch 'master' into quiz-prepare

commit a453afa10274e0ba045b1026f92a0cddbf9e1782
Merge: 81a5d033f63536a1616e624c6c9c67a93e20b777 604b7673c042aec12cb64c7b8e3e95fcdb52ffba
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sat May 16 01:00:58 2009 +0900

    Merge branch 'master' into quiz-prepare

commit 81a5d033f63536a1616e624c6c9c67a93e20b777
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sat May 16 00:16:01 2009 +0900

    add DDTSS URL question.

commit 2ec58e399501e798ae10fbc752666acef52c958c
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sat May 16 00:09:55 2009 +0900

    add quiz items.

commit ba9e35172b905f98f800a98f31b65c13e3b4f304
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sat May 16 00:05:54 2009 +0900

    correct merge direction.

commit c871fd7a355be3b9647a161fc22538961cbde2fd
Merge: 15802b55e3cee828f152bc4c658af87d2ee93308 1d22b961e2a5c88c25babca29e48771ed40ac035
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sat May 16 00:05:19 2009 +0900

    Merge commit 'origin' into quiz-prepare

commit 15802b55e3cee828f152bc4c658af87d2ee93308
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Thu May 7 19:19:56 2009 +0900

    add other commands to use with quiz preparation.

commit aec494d23b6b3f5fc39a1ea21e32eb907f2ccc39
Merge: 30ee4c13dea93f780275d2edaa72940ddebe9fa6 2bb48f010681f83fdbc5faae40d8fd4c9818f032
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Thu May 7 18:52:33 2009 +0900

    Merge branch 'master' into quiz-prepare

commit 30ee4c13dea93f780275d2edaa72940ddebe9fa6
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri May 1 18:11:43 2009 +0900

    revise quiz