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
..
gen/org/cocos2dx/application	issue #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00
jni	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance	2012-05-02 18:23:16 +08:00
res	Refactored project folders.	2012-04-19 11:46:08 +08:00
src/org/cocos2dx	issue #1201: simplify writing of Android.mk	2012-05-02 12:00:39 +08:00
AndroidManifest.xml	Refactored project folders.	2012-04-19 11:46:08 +08:00
build_native.sh	issue #1201: simplify writing of Android.mk	2012-05-02 12:00:39 +08:00
project.properties	Refactored project folders.	2012-04-19 11:46:08 +08:00