4 Commits

Author	SHA1	Message	Date
Ricardo Quesada	c386f88e32	Merge branch 'develop' into visit_draw_improved ... Conflicts: CHANGELOG cocos/gui/UILayout.h	2014-03-03 11:27:42 -08:00
Ricardo Quesada	b50a787f6d	Adds new ParticleTest for auto-batching	2014-02-28 22:03:36 -08:00
heliclei	d50391e5dd	add CCConosle [autotest run] command	2014-02-28 23:02:22 +08:00
James Chen	c2acfea633	issue #4116: Delete non-scripting files.	2014-02-26 21:17:17 +08:00