CocosRobot 899e0a4182 [AUTO]: updating luabinding automatically		2014-08-22 11:25:33 +00:00
..
2d	Merge pull request #7853 from super626/v3	2014-08-22 19:18:47 +08:00
3d	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-08-22 14:55:11 +08:00
audio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix	2014-08-07 11:58:01 +08:00
base	Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR	2014-08-21 22:38:59 +08:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	Merge pull request #7840 from minggo/fix-warning	2014-08-22 13:41:31 +08:00
math	- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)	2014-08-15 13:20:37 +03:00
network	use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES	2014-08-19 15:29:40 +08:00
physics	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step	2014-08-12 10:20:34 +08:00
platform	Reverse useless change	2014-08-21 19:40:18 +08:00
renderer	Merge pull request #7853 from super626/v3	2014-08-22 19:18:47 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-08-22 11:25:33 +00:00
storage	use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES	2014-08-19 15:29:40 +08:00
ui	Merge pull request #7834 from andyque/improveUI	2014-08-22 14:00:10 +08:00
Android.mk	Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR	2014-08-21 22:38:59 +08:00
CMakeLists.txt	Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project	2014-08-17 23:45:56 +08:00
cocos2d-prefix.pch	…
cocos2d.cpp	update version	2014-08-22 11:48:14 +08:00
cocos2d.h	! Set version to 3.3 (as it is no longer 3.2)	2014-08-21 18:04:46 +03:00