5 Commits

Author	SHA1	Message	Date
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
zhangbin	d9b42ccc67	Add plugin twitter for iOS.	2013-06-09 13:44:03 +08:00
James Chen	f22d320797	Removing CODE_SIGN_IDETITY section in prom.pbxproj.	2013-06-06 14:24:58 +08:00
zhangbin	f26530748a	Update the license in the sample code.	2013-06-05 11:19:17 +08:00
zhangbin	17d0ea1c09	fixed #2254 : Add sample code for plugin weibo on iOS.	2013-06-04 18:32:42 +08:00