Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'newcode' into v3

This commit is contained in:
yangxiao 2014-11-19 11:54:36 +08:00
parent fb638bdf94 1923524422
commit cd060e01dc
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cpp-empty-test/.cocos-project.json
View File

@ -41,5 +41,6 @@
"project_path": "../../build", "project_path": "../../build",
"sln_file": "cocos2d-win8.1-universal.sln", "sln_file": "cocos2d-win8.1-universal.sln",
"project_name": "HelloCpp.Windows" "project_name": "HelloCpp.Windows"
} },
"engine_dir": "../../"
} }

3
tests/cpp-tests/.cocos-project.json
View File

@ -41,5 +41,6 @@
"project_path": "../../build", "project_path": "../../build",
"sln_file": "cocos2d-win8.1-universal.sln", "sln_file": "cocos2d-win8.1-universal.sln",
"project_name": "cpp-tests.Windows" "project_name": "cpp-tests.Windows"
} },
"engine_dir": "../../"
} }

3
tests/lua-empty-test/.cocos-project.json
View File

@ -26,5 +26,6 @@
}, },
"android_cfg": { "android_cfg": {
"project_path": "project/proj.android" "project_path": "project/proj.android"
} },
"engine_dir": "../../"
} }

3
tests/lua-tests/.cocos-project.json
View File

@ -26,5 +26,6 @@
}, },
"android_cfg": { "android_cfg": {
"project_path": "project/proj.android" "project_path": "project/proj.android"
} },
"engine_dir": "../../"
} }

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit d6d63b4d76b15fa6b21074e5b8cf575385e33d28 Subproject commit 40e583566474a9e1e0ed1c7ab7a746f4fa354fa0