Commit Graph

5 Commits

Author SHA1 Message Date
zhangbin c20a067799 Merge branch 'develop' into ForUser
Conflicts:
	plugin/protocols/platform/android/PluginFactory.cpp
	plugin/protocols/proj.android/jni/Android.mk
2013-06-24 14:52:06 +08:00
zhangbin 79e2819107 Rename the class ProtocolSocial to ProtocolShare. 2013-06-24 14:30:38 +08:00
zhangbin b9a1dd3d19 Add ProtocolUser for custom system plugins. 2013-06-24 11:31:10 +08:00
zhangbin 9f61f92017 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
zhangbin c89bf0f1a8 Refactor the implementation of plugin protocols on android. 2013-05-24 17:34:01 +08:00