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
..
CCControlExtension	Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996	2013-09-16 20:58:26 +08:00
CCEditBox	issue #2784:Add class constructor js-binding document	2013-09-13 16:46:31 +08:00
CCScrollView	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase	2013-09-13 19:06:09 +08:00