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
..
CCAccelerometer_android.cpp	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCAccelerometer_android.h	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCApplication_android.cpp	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCApplication_android.h	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
CCEGLView_android.cpp	TextInputTest compile ok on android and merge last master code.	2011-04-26 18:04:07 +08:00
CCEGLView_android.h	TextInputTest compile ok on android and merge last master code.	2011-04-26 18:04:07 +08:00
CCFileUtils_android.cpp	issue #466, Modify the interface to fit the refactor of CCFileUtils.	2011-04-25 09:40:10 +08:00
CCImage_android.cpp	issue #439 wophone and android modified.	2011-03-29 15:05:53 +08:00
CCThread_android.cpp	issue #396 android modified.	2011-03-28 11:09:49 +08:00
Cocos2dJni.cpp	TextInputTest compile ok on android and merge last master code.	2011-04-26 18:04:07 +08:00
Cocos2dJni.h	CCIMEDispatcher works on android.	2011-04-22 16:33:41 +08:00