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
..
Cpp	Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996	2013-09-16 20:58:26 +08:00
Javascript	upstream synchronize	2013-09-16 19:46:14 +08:00
Lua	Deprecated methods are replaced (warning MSVC C4996 is suppressed).	2013-09-16 15:38:03 +03:00
samples.xcodeproj	Adding NewEventDispatcher Test.	2013-09-13 16:38:21 +08:00