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
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
 		2013-08-08 10:19:09 +08:00
..
AssetsManagerTest Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
HelloCpp Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
SimpleGame Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
TestCpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-08 10:19:09 +08:00