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
youyou 0e8c3409e5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
 		2013-12-13 16:28:50 +08:00
..
AssetsManagerTest Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
HelloCpp issue #2790: Reverts HelloWorldScene.cpp. 2013-12-04 17:51:53 +08:00
SimpleGame Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
TestCpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-13 16:28:50 +08:00