axmol/tests/cpp-tests/proj.wp8-xaml
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
..
TestCpp closed #4819: remove KeyboardTest 2014-05-28 18:31:00 +08:00
cpp-tests updated xaml resources 2014-06-16 09:25:35 -07:00
cpp-testsComponent Merge branch 'v3' into mergeExtensionEditBox 2014-09-01 15:26:25 +08:00
TestCpp.sln added wp8 support files and projects 2014-03-28 15:54:36 -07:00