James Chen 581ef454eb Merge pull request #6047 from samuele3hu/develop_test ... Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.		2014-03-28 18:04:12 +08:00
..
cpp-empty-test	Remove NativeActivity	2014-03-24 19:57:29 -07:00
cpp-tests	Solve the error effect of clipping in cpp-tests & lua-tests.	2014-03-28 17:45:28 +08:00
lua-empty-test	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test	2014-03-27 11:21:20 +08:00
lua-tests	Merge pull request #6047 from samuele3hu/develop_test	2014-03-28 18:04:12 +08:00