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
..
2d	Merge pull request #7237 from martell/v3	2014-08-07 10:36:10 +08:00
3d	Make CMake More Robust	2014-08-06 15:43:19 +01:00
audio	Fix libaudio.a outpur directory	2014-08-06 15:45:27 +01:00
base	Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake	2014-08-06 13:51:46 +08:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	Make CMake More Robust	2014-08-06 15:43:19 +01:00
math	add Quaternion::ZERO	2014-07-31 18:36:30 +08:00
network	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
physics	Mac dylib version works now	2014-07-17 20:58:50 +08:00
platform	Merge pull request #7691 from Dhilan007/v3	2014-08-07 10:52:59 +08:00
renderer	Make CMake More Robust	2014-08-06 15:43:19 +01:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-08-07 02:40:46 +00:00
storage	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
ui	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
Android.mk	merge cocos2d, fix lua	2014-08-04 12:07:27 +08:00
CMakeLists.txt	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
cocos2d-prefix.pch	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
cocos2d.cpp	[ci skip]	2014-07-15 15:11:17 +08:00
cocos2d.h	merge cocos2d, fix lua	2014-08-04 12:07:27 +08:00