OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/h58pcdgame/GameScriptCore...
authorttwilb <ttwilb@users.sourceforge.jp>
Wed, 14 Aug 2013 13:39:53 +0000 (22:39 +0900)
committerttwilb <ttwilb@users.sourceforge.jp>
Wed, 14 Aug 2013 13:39:53 +0000 (22:39 +0900)
commit66b60d815cde734cdb844da528bbab698879c9c0
tree8efa06a8077de41f025cd7ca565c1dd2865f9e04
parentfeaee3f41bdd2f010e89aa316ff04139a1f5187d
parent93fcdef6d55e4b4a68e5cb90ed093e8185f7b7f2
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/h58pcdgame/GameScriptCoreLibrary

Conflicts:
www/corelib/classes/CharacterClass.js
www/corelib/classes/CharacterClass.js