Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/test-lua/Resources
History
James Chen 99c20c4e30 Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 
Conflicts:
	tests/test-javascript/tests
 		2014-02-10 11:38:56 +08:00
..
cocosbuilderRes/ccb samples -> tests 2014-01-31 14:09:28 -08:00
luaScript Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 2014-02-10 11:38:56 +08:00