zhangbin 16d8cc9ec0 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: plugin/samples/HelloSocial/proj.ios/HelloSocial.xcodeproj/project.pbxproj		2013-06-09 13:58:09 +08:00
..
Classes	issue #2254 : Add plugin weibo for iOS.	2013-06-04 18:31:42 +08:00
Resources	Add HelloSocial sample	2013-04-24 16:00:36 +08:00
proj.android	issue #2224 : Modify the implementation of plugin twitter & weibo on android for the new framework of plugin.	2013-05-27 13:58:31 +08:00
proj.ios	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2013-06-09 13:58:09 +08:00