axmol/tests/test-lua
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
..
Classes samples -> tests 2014-01-31 14:09:28 -08:00
Resources Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 2014-02-10 11:38:56 +08:00
proj.android samples -> tests 2014-01-31 14:09:28 -08:00
proj.ios samples -> tests 2014-01-31 14:09:28 -08:00
proj.linux samples -> tests 2014-01-31 14:09:28 -08:00
proj.mac samples -> tests 2014-01-31 14:09:28 -08:00
proj.win32 samples -> tests 2014-01-31 14:09:28 -08:00
.gitignore samples -> tests 2014-01-31 14:09:28 -08:00
CMakeLists.txt samples -> tests 2014-01-31 14:09:28 -08:00