Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj
History
jianglong0156 7820610f13 Merge branch 'modifyTestResource' into jsWebviewTest 
Conflicts:
	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
	tests/js-tests/project.json
	tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
	tools/tojs/genbindings.py
 		2015-05-26 17:49:17 +08:00
..
xcshareddata/xcschemes Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
project.pbxproj Merge branch 'modifyTestResource' into jsWebviewTest 2015-05-26 17:49:17 +08:00