James Chen 3bc45e665c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-07-26 19:56:04 +08:00
..
Classes	issue #2430: Refactoring enum 'ResolutionPolicy'.	2013-07-26 18:18:58 +08:00
Resources	issue #2404:replace deprecated functions in testlua and hellolua sample	2013-07-26 13:43:28 +08:00
proj.android	[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();	2013-07-26 14:00:10 +08:00
proj.emscripten	issue #2404:Modify configs	2013-07-22 09:36:00 +08:00
proj.ios	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.linux	issue #2404:Modify configs	2013-07-22 09:36:00 +08:00
proj.mac	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.nacl	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.tizen	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.win32	issue #2404:Modify configs	2013-07-22 09:36:00 +08:00