Dhilan007 89db9ecd3b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn ... Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp		2014-10-10 17:02:45 +08:00
..
cocosbuilder	wp8: use CC_STATIC because libs are static	2014-10-09 06:33:46 +01:00
cocostudio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn	2014-10-10 17:02:45 +08:00
spine	wp8: use CC_STATIC because libs are static	2014-10-09 06:33:46 +01:00