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
..
AssetsManagerTest	update describe for support translucency on android	2013-12-30 18:12:43 +08:00
HelloCpp	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
SimpleGame	Deletes unused Makefile for linux.	2014-01-06 19:36:13 -08:00
TestCpp	Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode	2014-01-09 17:03:08 +08:00