lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 ... Conflicts: cocos/2d/cocos2d.vcxproj.filters cocos/3d/CCBundle3D.cpp cocos/3d/CCBundle3D.h		2014-06-12 15:53:41 +08:00
..
cocosbuilder	The default size of CCMenu in CocosBuilder is 0,0	2014-05-22 16:21:51 +08:00
cocostudio	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-06-12 15:53:41 +08:00
spine	Adds setNormalizedPosition()	2014-05-30 16:42:05 -07:00