Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/js-tests/project
History
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
 		2015-06-15 16:13:36 +08:00
..
Classes Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 2015-06-15 16:13:36 +08:00
proj.android modify android res copy 2015-06-15 09:55:10 +08:00
proj.android-studio modify android res copy 2015-06-15 09:55:10 +08:00
proj.ios Add js-tests 2015-04-16 18:07:35 +08:00
proj.linux Add js-tests 2015-04-16 18:07:35 +08:00
proj.mac Add js-tests 2015-04-16 18:07:35 +08:00
proj.win8.1-universal modify resource to res/resjs 2015-06-15 09:54:00 +08:00
proj.win32 add win32 project resource copy 2015-06-15 09:55:05 +08:00
CMakeLists.txt copy resources in linux 2015-05-26 16:34:04 +08:00