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
..
HelloAds	issue #2224 : Modify the implementation of plugin admob.	2013-05-27 14:40:08 +08:00
HelloAnalytics	Update the license in the sample code.	2013-06-05 11:19:17 +08:00
HelloAnalytics-JS	fixed #2224 : Update the JS binding code for plugin.	2013-06-04 10:06:16 +08:00
HelloIAP	issue #2224 : Modify the implementation of plugin alipay & nd91.	2013-05-27 14:19:36 +08:00
HelloIAP-JS	fixed #2224 : Update the JS binding code for plugin.	2013-06-04 10:06:16 +08:00
HelloSocial	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2013-06-09 13:58:09 +08:00