minggo 826e1018cb fix conflict		2014-08-29 16:55:09 +08:00
..
2d	fix conflict	2014-08-29 16:55:09 +08:00
3d	remove unneeded includes	2014-08-29 15:39:52 +08:00
audio	remove unneeded includes	2014-08-29 15:39:52 +08:00
base	fix compiling error on windows	2014-08-29 16:44:20 +08:00
deprecated	Adds `std::nothrow` to `new`	2014-08-27 16:31:57 -07:00
editor-support	fix compiling error on windows	2014-08-29 16:44:20 +08:00
math	remove unneeded includes	2014-08-29 15:39:52 +08:00
network	remove unneeded includes	2014-08-29 15:39:52 +08:00
physics	Merge pull request #7900 from minggo/setposition-optimize	2014-08-28 14:31:54 +08:00
platform	fix conflict	2014-08-29 15:45:21 +08:00
renderer	fix conflict	2014-08-29 16:55:09 +08:00
scripting/lua-bindings	fix conflict	2014-08-29 16:55:09 +08:00
storage/local-storage	Adjust android.mk for cocos2d and related module	2014-08-27 22:54:28 +08:00
ui	rename webview to UIWebView	2014-08-29 11:28:28 +08:00
Android.mk	Adjust android.mk for cocos2d and related module	2014-08-27 22:54:28 +08:00
CMakeLists.txt	fix linux	2014-08-29 11:53:39 +08: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