songchengjiang 014ba0d12e Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new		2014-08-28 10:17:32 +08:00
..
2d	merge cocos	2014-08-28 09:22:57 +08:00
3d	merge cocos	2014-08-28 09:22:57 +08:00
audio	Remove the useless aneroid.mk files	2014-08-27 10:21:47 +08:00
base	Merge pull request #7879 from dabingnn/v3_fixLabelStatus	2014-08-26 14:51:08 +08:00
deprecated	one static library for c++ and another one for lua-binding	2014-08-24 03:52:51 -07:00
editor-support	fix conflict	2014-08-27 13:50:01 +08:00
math	- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)	2014-08-15 13:20:37 +03:00
network	Remove the useless aneroid.mk files	2014-08-27 10:21:47 +08:00
physics	one static library for c++ and another one for lua-binding	2014-08-24 03:52:51 -07:00
platform	fix conflict	2014-08-27 13:50:01 +08:00
renderer	Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new	2014-08-28 10:17:32 +08:00
scripting/lua-bindings	Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.	2014-08-27 10:18:44 +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	fix conflict	2014-08-27 13:50:01 +08:00
Android.mk	android light	2014-08-28 09:46:54 +08:00
CMakeLists.txt	fix compiling error of cpp-tests on linux	2014-08-24 19:12:36 -07:00
cocos2d-prefix.pch	add cocos2d.h into pre-compiled header	2014-08-26 16:45:24 +08:00
cocos2d.cpp	update version	2014-08-22 11:48:14 +08:00
cocos2d.h	Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.	2014-08-27 10:18:44 +08:00