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/proj.wp8-xaml/cpp-testsComponent
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
..
cpp-testsComponent.vcxproj Merge branch 'v3' into mergeExtensionEditBox 2014-09-01 15:26:25 +08:00
cpp-testsComponent.vcxproj.filters fix windows & win8 & wp8 compile error 2014-08-20 12:02:12 +08:00
pch.cpp added wp8 support files and projects 2014-03-28 15:54:36 -07:00
pch.h Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00