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_win32.h	issue #375: fix some compile error	2011-03-09 10:21:29 +08:00
CCApplication_win32.cpp	fixed #373 Hide PVRFrame window on win32.	2011-03-09 10:39:08 +08:00
CCApplication_win32.h	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00
CCEGLView_win32.cpp	CCIMEDispatcher works on android.	2011-04-22 16:33:41 +08:00
CCEGLView_win32.h	CCTextFieldTTF works on win32.	2011-04-19 09:32:33 +08:00
CCFileUtils_win32.cpp	[win32] issue #471, CCFileUtils::fullPathFromRelativeFile mustn't calculate realtive path twice	2011-04-26 14:53:57 +08:00
CCImage_win32.cpp	issue #439 CCFileData and imageWithImageFile modified on win32.	2011-03-29 11:41:44 +08:00
CCThread_win32.cpp	issue #396 android modified.	2011-03-28 11:09:49 +08:00