Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/GUI/CCEditBox
History
Huabing.Xu 3b83d52f95 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/ui/UIButton.cpp
	cocos/ui/UIButton.h
	cocos/ui/UICheckBox.cpp
	cocos/ui/UICheckBox.h
	cocos/ui/UIImageView.cpp
	cocos/ui/UIImageView.h
	cocos/ui/UILayout.cpp
	cocos/ui/UILayout.h
	cocos/ui/UILoadingBar.cpp
	cocos/ui/UIRichText.h
	cocos/ui/UISlider.cpp
	cocos/ui/UIText.cpp
	cocos/ui/UIText.h
	cocos/ui/UITextAtlas.cpp
	cocos/ui/UITextAtlas.h
	cocos/ui/UITextBMFont.cpp
	cocos/ui/UITextBMFont.h
	cocos/ui/UITextField.cpp
	cocos/ui/UITextField.h
	cocos/ui/UIWidget.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
 		2014-04-19 00:30:34 +08:00
..
CCEditBox.cpp replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CCEditBox.h migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00
CCEditBoxImpl.h migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00
CCEditBoxImplAndroid.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
CCEditBoxImplAndroid.h migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00
CCEditBoxImplIOS.h replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CCEditBoxImplIOS.mm Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
CCEditBoxImplMac.h replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CCEditBoxImplMac.mm Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
CCEditBoxImplNone.cpp fix line end in windows 2013-09-20 22:23:13 +08:00
CCEditBoxImplWin.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
CCEditBoxImplWin.h migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00
CCEditBoxImplWp8.cpp replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CCEditBoxImplWp8.h migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00