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

[Junichi Uekawa]

New branch 'master-broken-yabuki' available with the following commits:
commit 93ae3e4f3060f58f11b19658f71f5957258b4852
Author: Junichi Uekawa <dancer at coreduo.netfort.gr.jp>
Date:   Sun Jun 24 23:34:21 2007 +0900

    add text

commit 52e9d0172dfbd4661a54a2b4f8f23071063ef42b
Author: Junichi Uekawa <dancer at coreduo.netfort.gr.jp>
Date:   Sun Jun 24 23:29:42 2007 +0900

    fix yabuki breakage: re-commit with iso-2022-jp

commit 381df7ce48803f84d812a2d010566ad77c1b33a3
Author: Yukiharu YABUKI <yabuki at Ernalda.localdomain>
Date:   Sun Jun 24 01:02:59 2007 +0900

    add text

commit b8117d01961aeeec625c2bcf4e9875c5526c4e44
Merge: 4a824eb0869fc849f4924c7accc8b6c129050198 4fe26a1a8f599e0787cd01c6ca4027c7c36f33b4
Author: Yukiharu YABUKI <yabuki at Ernalda.localdomain>
Date:   Sat Jun 23 22:18:57 2007 +0900

    fix conflict

commit 4fe26a1a8f599e0787cd01c6ca4027c7c36f33b4
Merge: cba38a513cf209a8fd654179789d26a2e5d26b41 8e0f68eb3a9c8f0edb93503f24c9f5610aae67b6
Author: Junichi Uekawa <dancer at coreduo.netfort.gr.jp>
Date:   Sat Jun 23 21:48:33 2007 +0900

    fix conflict

commit cba38a513cf209a8fd654179789d26a2e5d26b41
Author: Junichi Uekawa <dancer at coreduo.netfort.gr.jp>
Date:   Sat Jun 23 21:47:49 2007 +0900

    resolve conflict generated by yabuki