samuele3hu 4f1a46136a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample		2013-07-24 10:15:39 +08:00
..
Cpp	issue #2378: ParticleTest: _emitter->getOpacityModifyRGB --> _emitter->isOpacityModifyRGB	2013-07-23 20:47:19 +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 TestSample	2013-07-24 10:15:39 +08:00
samples.xcodeproj	issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample	2013-07-24 10:15:16 +08:00