James Chen dc7fcce0fe Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum ... Conflicts: scripting/javascript/bindings/generated scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-07-26 21:22:16 +08:00
..
.externalToolBuilders	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Classes	Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum	2013-07-26 21:22:16 +08:00
Resources	issue #2277: Add OpenGL lua test samples	2013-06-19 16:40:02 +08:00
proj.android	[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();	2013-07-26 14:00:10 +08:00
proj.emscripten	Use of a single emscripten HTML template file.	2013-07-24 17:59:21 +02:00
proj.ios	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.linux	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +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	[Tizen] Fix compile error.	2013-07-19 15:16:05 +09:00
proj.win32	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
.cproject	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Android.mk	Implements a socket.io client extension, adds a test case and updates the android makefiles.	2013-07-11 17:41:42 -04:00