James Chen b128018f76 Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 ... Conflicts: extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp		2013-09-16 20:58:26 +08:00
..
cocos2dx_support	Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996	2013-09-16 20:58:26 +08:00
lua	[NaCl] Remove missing functions from lua stdlib.	2013-06-20 12:56:15 -07:00
luajit	issue #2371: Adding scripting/lua/luajit/mac/libluajit.a	2013-07-04 17:11:13 +08:00
proj.android	issue #2768:Add LuaObjectBridge and LuaJavaBridge	2013-09-11 09:48:24 +08:00
proj.emscripten	issue #2433:Remove some functions and files in cocos2dx_support	2013-09-02 10:54:39 +08:00
proj.ios	issue #2325: Updating project configuration, tested on iPad 3.	2013-06-24 18:32:06 +08:00
proj.linux	issue #2433:Remove some functions and files in cocos2dx_support	2013-09-02 10:54:39 +08:00
proj.nacl	issue #2103 modify some compile setup	2013-06-03 18:14:06 +08:00
proj.qt5	issue #2433:Modify platform config and some test samples	2013-08-22 15:06:34 +08:00
proj.tizen	[Tizen] Fix Debug Settings.	2013-08-06 01:26:56 +09:00
proj.win32	issue #2433:Remove some functions and files in cocos2dx_support	2013-09-02 10:54:39 +08:00
script	Delete some end lines	2013-09-16 10:58:02 +08:00
tolua	issue #2433:Modify platform config and some test samples	2013-08-30 11:56:35 +08:00