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
..
Classes	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
proj.android	Add module Android.mk config and adjust related test cases	2014-08-05 13:29:54 +08:00
proj.ios_mac	Modify lua-template-default and lua-template-runtime project	2014-08-07 13:54:54 +08:00
proj.linux	lua tempalte support for linux	2014-03-14 16:58:33 +08:00
proj.win32	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00