axmol/tests/Classes/ShaderTest
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
..
ShaderTest.cpp Merge branch 'develop' into visit_draw_improved 2014-03-03 11:27:42 -08:00
ShaderTest.h Cache working OK. 2014-02-28 16:10:48 -08:00
ShaderTest2.cpp Adds new ParticleTest for auto-batching 2014-02-28 22:03:36 -08:00
ShaderTest2.h issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00