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
..
HelloSocial.xcodeproj	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2013-06-09 13:58:09 +08:00
AppController.h	Update the license in the sample code.	2013-06-05 11:19:17 +08:00
AppController.mm	Update the license in the sample code.	2013-06-05 11:19:17 +08:00
Default-568h@2x.png.REMOVED.git-id	fixed #2254 : Add sample code for plugin weibo on iOS.	2013-06-04 18:32:42 +08:00
Default@2x.png.REMOVED.git-id	fixed #2254 : Add sample code for plugin weibo on iOS.	2013-06-04 18:32:42 +08:00
Prefix.pch	fixed #2254 : Add sample code for plugin weibo on iOS.	2013-06-04 18:32:42 +08:00
RootViewController.h	Update the license in the sample code.	2013-06-05 11:19:17 +08:00
RootViewController.mm	Update the license in the sample code.	2013-06-05 11:19:17 +08:00
main.m	Update the license in the sample code.	2013-06-05 11:19:17 +08:00