James Chen fd9ab5c4d1 Merge pull request #6039 from Dhilan007/develop_label ... LabelTTF and LabelBMFont tagged as deprecated		2014-03-28 14:31:11 +08:00
..
cpp-empty-test	Remove NativeActivity	2014-03-24 19:57:29 -07:00
cpp-tests	Merge pull request #6039 from Dhilan007/develop_label	2014-03-28 14:31:11 +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 branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test	2014-03-27 11:21:20 +08:00