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
..
frameworks	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer	2014-07-08 14:57:19 +08:00
res	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
runtime/ios	update sim to support Xcode 5.1	2014-03-26 11:27:50 +08:00
src	Update lua-template and lua-empty-test for replacing bgMusicPath	2014-05-28 10:27:03 +08:00
cocos-project-template.json	Add configuration in templates to set the bundle identity of Mac & iOS project.	2014-07-08 10:22:08 +08:00