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
History
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 		2014-10-15 13:41:27 +08:00
..
Classes Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 2014-10-15 13:41:27 +08:00
Resources Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 2014-10-15 13:41:27 +08:00
proj.android Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 2014-10-15 13:41:27 +08:00
proj.ios precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
proj.linux Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
proj.mac precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
proj.win32 no message 2014-10-09 18:30:39 +08:00
proj.wp8-xaml Reverting tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj 2014-10-12 15:53:32 +08:00
.cocos-project.json issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
CMakeLists.txt no message 2014-10-09 18:30:39 +08:00