Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac
History
samuele3hu 521f805219 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/bindings-generator
	tools/tolua/cocos2dx_physics.ini
 		2014-07-08 14:57:19 +08:00
..
HelloLua.xcodeproj Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-07-08 14:57:19 +08:00
ios Add configuration in templates to set the bundle identity of Mac & iOS project. 2014-07-08 10:22:08 +08:00
mac Add configuration in templates to set the bundle identity of Mac & iOS project. 2014-07-08 10:22:08 +08:00