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 08cd81ff43 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated 
Conflicts:
	scripting/auto-generated
 		2013-08-27 16:59:59 +08:00
..
AssetsManagerTest Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated 2013-08-27 16:59:59 +08:00
HelloCpp fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
SimpleGame fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
TestCpp Merge pull request #3482 from minggo/release_unneeded_codes 2013-08-26 23:23:41 -07:00