Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Cpp
History
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
..
AssetsManagerTest issue #2800:Can not hide status bar on iOS 7 2013-09-13 15:54:58 +08:00
HelloCpp issue : [dispatcher] Reverts: HelloCpp. 2013-09-16 16:22:22 +08:00
SimpleGame Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
TestCpp Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 2013-09-16 20:58:26 +08:00