James Chen f67f324378 Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289 ... Conflicts: cocos/2d/platform/win32/CCImage.cpp		2014-02-17 22:10:45 +08:00
..
cocosbuilder	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
cocostudio	Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289	2014-02-17 22:10:45 +08:00
spine	Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int	2014-01-20 15:03:30 +08:00