samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: cocos/network/CMakeLists.txt cocos/storage/CMakeLists.txt		2014-08-07 14:02:50 +08:00
..
.settings	modify version num	2014-07-12 14:50:23 +08:00
frameworks/runtime-src	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
res	move runtime res path	2014-05-22 22:08:04 +08:00
runtime	1.3.1	2014-07-17 09:30:56 -07:00
src	Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates	2014-08-04 17:11:57 +08:00
.project	version.json	2014-07-03 19:56:21 -07: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
config.json	add local for main.lua	2014-07-16 20:49:24 +08:00