Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/ui/proj.win32
History
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
..
Win32InputBox.cpp merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
Win32InputBox.h merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
libui.vcxproj Remove the useless win32 project 2014-08-27 10:20:15 +08:00
libui.vcxproj.filters Remove the useless win32 project 2014-08-27 10:20:15 +08:00