Dhilan007 1247760d95 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs ... Conflicts: cocos/2d/CCLabel.cpp		2014-03-26 11:15:48 +08:00
..
cpp-empty-test	Remove NativeActivity	2014-03-24 19:57:29 -07:00
cpp-tests	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs	2014-03-26 11:15:48 +08:00
lua-empty-test	close #4400: Use the newest version of LuaSocket for lua	2014-03-20 17:04:54 +08:00
lua-tests	Merge pull request #5889 from samuele3hu/develop_socket	2014-03-21 10:52:38 +08:00