Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/proj.android/jni
History
James Chen 395dbc90aa Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance 
Conflicts:
	lua/cocos2dx_support/LuaCocos2d.cpp
 		2012-05-02 18:23:16 +08:00
..
tests Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance 2012-05-02 18:23:16 +08:00
Android.mk issue #1201: simplify writing of Android.mk 2012-05-02 12:00:39 +08:00
Application.mk issue #1201: simplify writing of Android.mk 2012-05-02 12:00:39 +08:00