axmol/cocos2dx/base_nodes
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
..
CCAtlasNode.cpp Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CCAtlasNode.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCGLBufferedNode.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCGLBufferedNode.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCNode.cpp issue #2087: [dispatcher] Making Node::updateEventPriorityIndex to inline function. 2013-09-16 16:39:59 +08:00
CCNode.h Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 2013-09-16 20:58:26 +08:00