CaiWenzhi 233faea690 Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs		2014-01-17 13:11:29 +08:00
..
2d	Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas	2014-01-17 11:10:04 +08:00
audio	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
base	Renderer: When not using VAOs, call...	2014-01-16 15:02:39 -08:00
editor-support	Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs	2014-01-17 11:25:38 +08:00
gui	Add clone method to LayoutParameter	2014-01-17 13:10:04 +08:00
math/kazmath	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
network	un-define clash with the existing macro definition in platform/win32/CCStdC.h	2014-01-14 14:20:22 +08:00
physics	Merge pull request #4932 from boyu0/iss3401_physical_lua_binding	2014-01-06 23:48:47 -08:00
scripting	[AUTO] : updating submodule reference to latest autogenerated bindings	2014-01-16 02:43:13 +00:00
storage/local-storage	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00