axmol/samples
minggo f6cfe3007f issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
..
Cpp issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
Javascript issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
Lua issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
samples.xcodeproj Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc 2013-07-18 23:29:41 +08:00