shujunqiao 9ffb26fdc9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test		2014-03-28 17:50:29 +08:00
..
2d	Fixed possible crash if invoking FontAtlasCache::purgeCachedData.	2014-03-28 16:52:48 +08:00
audio	closed #4562, fix audio resume bug after stop the music	2014-03-27 10:43:57 +08:00
base	add [director end] command's explain in CCConsole.cpp.	2014-03-28 13:50:06 +08:00
editor-support	Remove the old implementation of LabelBMFont.	2014-03-28 10:28:44 +08:00
math/kazmath	Adds CC_DLL to kazmath for windows compatibility	2014-03-04 18:07:03 -08:00
network	Merge pull request #5943 from koowolf/websocket_fix	2014-03-25 16:28:18 +08:00
physics	Add ProtectedNode and remove "addNode"	2014-03-25 14:28:58 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-03-28 08:20:29 +00:00
storage	Linux local storage support. Depends on libsqlite3-dev	2014-02-13 00:53:51 +01:00
ui	Remove the old implementation of LabelBMFont.	2014-03-28 10:28:44 +08:00