Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/lua-tests
History
samuele3hu 6c79ce50d2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
	tests/lua-tests/src/mainMenu.lua
 		2014-10-15 15:07:30 +08:00
..
project Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 2014-10-15 15:07:30 +08:00
res/cocosbuilderRes Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
src Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 2014-10-15 15:07:30 +08:00
.cocos-project.json issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00