zhangbin e994321a61 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: plugin/samples/HelloSocial/proj.ios/HelloSocial.xcodeproj/project.pbxproj		2013-06-09 17:30:37 +08:00
..
Classes	issue #2254 : Add plugin weibo for iOS.	2013-06-05 10:30:43 +08:00
Resources	Add HelloSocial sample	2013-04-24 16:00:36 +08:00
proj.android	Add support for C++ 11in samples	2013-06-04 11:49:46 +08:00
proj.ios	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-06-09 17:30:37 +08:00