chuanweizhang 2579573b7e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop		2013-12-31 14:58:37 +08:00
..
jni	closed #3108: add -fsigned-char to make char to signed as default	2013-11-04 10:48:45 +08:00
res/values	issue #1733: Updated hybrid lua template project.	2013-02-20 12:01:47 +08:00
src/org/cocos2dx/hellolua	update describe for support translucency on android	2013-12-30 16:42:33 +08:00
.classpath	issue #2854:Disable CDT Builder on Eclipse	2013-11-15 14:35:55 +08:00
.project	[Android] Updating multi-platform-lua/proj.android/.project	2013-06-10 13:19:16 +08:00
AndroidManifest.xml	recover java activity on android.	2013-12-30 15:58:04 +08:00
ant.properties	issue #1733: Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.	2013-02-19 15:38:30 +08:00
build.xml	issue #1733: Updated hybrid lua template project.	2013-02-20 12:01:47 +08:00
build_native.py	modify template	2013-12-25 11:01:23 +08:00
proguard-project.txt	issue #1733: Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.	2013-02-19 15:38:30 +08:00
project.properties	modify template	2013-12-25 11:01:23 +08:00