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
..
CCLabelAtlas.cpp	fixed #430 Solved bug by replacing glColor4ub with glColor4f.	2011-03-25 13:50:57 +08:00
CCLabelBMFont.cpp	fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.	2011-04-21 14:46:15 +08:00
CCLabelTTF.cpp	CCTextFieldTTF works on win32.	2011-04-19 09:32:33 +08:00