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
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 		2015-07-21 11:39:24 +08:00
..
Classes Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-21 11:39:24 +08:00
Resources Merge remote-tracking branch 'upstream/v3' into v3 2015-07-14 11:24:38 +08:00
proj.android Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
proj.android-studio Merge remote-tracking branch 'upstream/v3' into v3 2015-07-14 11:24:38 +08:00
proj.ios
…
proj.linux
…
proj.mac
…
proj.win8.1-universal Merge remote-tracking branch 'upstream/v3' into v3 2015-07-14 11:24:38 +08:00
proj.win10 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
proj.win32 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
.cocos-project.json Solve the error when run tests projects with `cocos run`. 2015-06-24 15:33:13 +08:00
CMakeLists.txt Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00