Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved ... Conflicts: CHANGELOG cocos/gui/UILayout.h		2014-03-03 11:27:42 -08:00
..
cocosbuilder	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
cocostudio	Merge branch 'develop' into visit_draw_improved	2014-03-03 11:27:42 -08:00
spine	Cache working OK.	2014-02-28 16:10:48 -08:00