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/hellolua	fixed #1201: simplify the writing of Android.mk and correct corresponding template	2012-05-02 17:29:16 +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	fixed #1201: simplify the writing of Android.mk and correct corresponding template	2012-05-02 17:29:16 +08:00
AndroidManifest.xml	Refactored project folders.	2012-04-19 11:46:08 +08:00
build_native.sh	fixed #1201: simplify the writing of Android.mk and correct corresponding template	2012-05-02 17:29:16 +08:00
default.properties	issue #1190: Updated some files for android port.	2012-04-26 11:52:21 +08:00
project.properties	fixed #1201: simplify the writing of Android.mk and correct corresponding template	2012-05-02 17:29:16 +08:00