James Chen 2133c0e566 Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode ... Conflicts: cocos/2d/CCDrawNode.h		2014-01-09 17:03:08 +08:00
..
DrawPrimitivesTest.cpp	Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode	2014-01-09 17:03:08 +08:00
DrawPrimitivesTest.h	change CustomCommand variable to class member.	2013-12-26 21:19:12 +08:00