Commit Graph

154 Commits

Author SHA1 Message Date
andyque 51e160beff fix EditBox lua compile error 2014-09-02 17:37:55 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
andyque 46f3ab9b57 add Scale9Sprite to create method of ui::EditBox 2014-08-20 16:08:28 +08:00
andyque 8d1c422ac5 merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00