Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest
History
andyque 312ab4f396 Merge branch 'v3' into feature5161 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
 		2014-06-24 09:51:18 +08:00
..
UITextFieldTest.cpp refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
UITextFieldTest.h issue #5057, refator UITextField 2014-05-12 11:29:22 +08:00
UITextFieldTest_Editor.cpp Merge branch 'v3' into feature5161 2014-06-24 09:51:18 +08:00
UITextFieldTest_Editor.h issue #5057, refator UITextField 2014-05-12 11:29:22 +08:00