OSDN Git Service

Merge branch 'part11' master
authoro_ggy <o_ggy@git.sourceforge.jp>
Thu, 7 Jul 2011 15:05:04 +0000 (00:05 +0900)
committero_ggy <o_ggy@git.sourceforge.jp>
Thu, 7 Jul 2011 15:05:04 +0000 (00:05 +0900)
commitf9992744065e15e603c8262b55f84e5a2d976442
tree4fc86e6e810803770cf5a208e95c7aa1272af037
parent99efa0590a4a73d6a9ca53634262e7fb3d9c14f1
parent7c59705f63db67f7b41930c46ab62e9031bee40e
Merge branch 'part11'

Conflicts:
saisei-1.0/resource/image/Thumbs.db
saisei-1.0/resource/image/area/Thumbs.db
saisei-1.0/resource/image/battler/Thumbs.db
saisei-1.0/resource/image/shop/Thumbs.db
saisei-1.0/resource/image/Thumbs.db.orig
saisei-1.0/resource/image/area/Thumbs.db.orig
saisei-1.0/resource/image/battler/Thumbs.db.orig
saisei-1.0/resource/image/shop/Thumbs.db.orig