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
chengstory 7f8224b621 Merge branch 'develop' into #3480 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
 		2014-01-03 19:36:22 +08:00
..
AssetsManagerTest update describe for support translucency on android 2013-12-30 18:12:43 +08:00
HelloCpp update describe for support translucency on android 2013-12-30 18:12:43 +08:00
SimpleGame update describe for support translucency on android 2013-12-30 18:12:43 +08:00
TestCpp Merge branch 'develop' into #3480 2014-01-03 19:36:22 +08:00