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
..
ActionsTest.cpp	Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996	2013-09-16 20:58:26 +08:00
ActionsTest.h	[Dispatcher] New event dispatcher, first commit.	2013-09-11 22:09:34 +08:00