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
..
HelloWorld.xcodeproj	TextInputTest compile ok on android and merge last master code.	2011-04-26 18:04:07 +08:00
AppController.h	Move ccxApplication to cocos2dx/platform on ios.	2011-03-02 17:05:22 +08:00
AppController.mm	[ios]fix #419,Enable the depth test when EAGLView is created.	2011-03-21 17:15:20 +08:00
HelloWorld_Prefix.pch	Move ccxApplication to cocos2dx/platform on ios.	2011-03-02 17:05:22 +08:00