James Chen 2c599d31b5 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter		2012-02-15 17:02:47 +08:00
..
gen/org/cocos2dx/hellolua	fixed #930: linux supports jpg format file	2012-01-12 17:46:53 +08:00
jni	fixed #971: build cocos2dx as static lib	2012-02-10 10:31:56 +08:00
res	fixed #957: avoid to go to background when inputting test	2012-02-14 16:02:41 +08:00
src/org/cocos2dx	fixed #957: avoid to go to background when inputting test	2012-02-14 16:02:41 +08:00
AndroidManifest.xml	modify picture and set android icon for HelloLua	2012-01-12 10:39:39 +08:00
build_native.sh	rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.	2012-02-14 18:04:56 +08:00
default.properties	fixed #930: linux supports jpg format file	2012-01-12 17:46:53 +08:00