James Chen f95a862718 Merge pull request #5220 from dumganhar/develop ... Fixes two mistakes 1) Color4B(const Color3B& color), 2) A comment typo in CCObject.h		2014-01-24 06:36:44 -08:00
..
2d	Merge pull request #5220 from dumganhar/develop	2014-01-24 06:36:44 -08:00
audio	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
base	Fixes a comment typo in CCObject.h.	2014-01-24 22:34:14 +08:00
editor-support	closed #3833: SceneTest of CocoStudio crashes	2014-01-24 11:50:58 +08:00
gui	Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int	2014-01-20 15:03:30 +08:00
math/kazmath	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
network	fix compiling error cause by undefined ssize_t on vs.	2014-01-21 09:52:43 +08:00
physics	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
scripting	Merge pull request #5212 from samuele3hu/developBug	2014-01-24 02:00:15 -08:00
storage/local-storage	[Win32] fix localStorageGetItem crash when column text is NULL.	2014-01-22 17:37:29 +09:00