Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position ... Conflicts: CHANGELOG cocos/ui/UILayout.cpp		2014-06-04 09:19:22 -07:00
..
cocosbuilder	The default size of CCMenu in CocosBuilder is 0,0	2014-05-22 16:21:51 +08:00
cocostudio	Merge remote-tracking branch 'cocos2d/v3' into normalized_position	2014-06-04 09:19:22 -07:00
spine	Adds setNormalizedPosition()	2014-05-30 16:42:05 -07:00