OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/h58pcdgame/GameScriptCore...
authorkoenma <pengin.king.kid@gmail.com>
Wed, 28 Aug 2013 01:42:11 +0000 (10:42 +0900)
committerkoenma <pengin.king.kid@gmail.com>
Wed, 28 Aug 2013 01:42:11 +0000 (10:42 +0900)
commit443d4c5802b4f7b808649f198185358ff5ae4f55
tree057f676fcceadff6e1a63a87c0de5ad1c8b8951a
parent3c0bbaaa5ea4c1ff352f3c878edd6193fa0de258
parent4272b0ead671d7eb635454acacb931ee2d9a1274
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/h58pcdgame/GameScriptCoreLibrary

Conflicts:
www/corelib/classes/EnemyCharacters/EnemyCharacterClass_Spine.js
www/stage/okubo.js