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 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 
Conflicts:
	cocos2dx/Android.mk
 		2013-08-05 10:09:15 +08:00
..
AssetsManagerTest [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
HelloCpp Merge pull request #3336 from minggo/simplify-sample-code 2013-07-31 00:41:20 -07:00
SimpleGame [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
TestCpp Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 2013-08-05 10:09:15 +08:00