James Chen 9b0f2a6e33 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2344-js-scriptprotocol		2013-07-22 17:25:29 +08:00
..
Cpp	issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance	2013-07-22 17:24:54 +08:00
Javascript	issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance	2013-07-22 17:24:54 +08:00
Lua	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2344-js-scriptprotocol	2013-07-22 17:25:29 +08:00
samples.xcodeproj	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc	2013-07-18 23:29:41 +08:00