zhangbin 34fbcad467 Merge branch 'ForReflection' into develop ... Conflicts: plugin/protocols/platform/ios/PluginUtilsIOS.mm		2013-05-30 17:42:37 +08:00
..
jsbindings	Add plugin weibo & demo code in HelloSocial.	2013-05-14 13:49:19 +08:00
plugins	issue #2224 : Modify the implementation of plugin flurry & umeng on iOS for the new framework.	2013-05-30 14:57:39 +08:00
protocols	Merge branch 'ForReflection' into develop	2013-05-30 17:42:37 +08:00
samples	issue #2224 : Modify the implementation of plugin flurry & umeng on iOS for the new framework.	2013-05-30 14:57:39 +08:00
tools	issue #2224 : Modify the implementation of plugin alipay & nd91.	2013-05-27 14:19:36 +08:00
.gitignore	Optimize the sample code of HelloIAP.	2013-04-08 17:32:58 +08:00