yangws e895d9d073 TextInputTest compile ok on android and merge last master code. ... Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input Conflicts: HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/platform/android/Cocos2dJni.cpp tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java tests/test.ios/test.xcodeproj/project.pbxproj tests/test.win32/test.win32.vcproj		2011-04-26 18:04:07 +08:00
..
gen/org/cocos2dx/application	[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld	2011-04-12 15:37:44 +08:00
jni	[android] fixed typo in CCEGLView method name	2011-04-24 18:52:21 +04:00
res	[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld	2011-04-12 15:37:44 +08:00
src/org/cocos2dx	TextInputTest compile ok on android and merge last master code.	2011-04-26 18:04:07 +08:00
AndroidManifest.xml	issue #260, Helloworld.android will auto scale to WVGA resolution	2010-12-20 11:31:40 +08:00
build_native.sh	[android] fixed #368: move Application code to cocos2dx/platform/ccxApplication	2011-03-01 19:53:39 +08:00
default.properties	[android] fixed #422: multitouch for android	2011-03-29 14:20:05 +08:00