yangxiao fdc0fad935 tmp work		2014-08-27 14:46:24 +08:00
..
2d	merge cocos	2014-08-26 14:05:59 +08:00
3d	tmp work	2014-08-27 14:46:24 +08:00
audio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module	2014-08-25 11:52:52 +08:00
base	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module	2014-08-25 11:52:52 +08:00
deprecated	one static library for c++ and another one for lua-binding	2014-08-24 03:52:51 -07:00
editor-support	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module	2014-08-25 11:52:52 +08:00
math	- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)	2014-08-15 13:20:37 +03:00
network	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module	2014-08-25 11:52:52 +08:00
physics	one static library for c++ and another one for lua-binding	2014-08-24 03:52:51 -07:00
platform	Merge pull request #7864 from minggo/module-devide	2014-08-25 11:01:19 +08:00
renderer	merge cocos	2014-08-27 11:00:14 +08:00
scripting/lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module	2014-08-25 11:52:52 +08:00
storage/local-storage	one static library for c++ and another one for lua-binding	2014-08-24 03:52:51 -07:00
ui	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module	2014-08-25 11:52:52 +08:00
Android.mk	Fix the win32 and android compile error	2014-08-25 14:10:13 +08:00
CMakeLists.txt	fix compiling error of cpp-tests on linux	2014-08-24 19:12:36 -07:00
cocos2d-prefix.pch	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
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