[Pkg-owncloud-commits] [owncloud-client] 04/12: Merge branch 'master' into experimental

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch experimental
in repository owncloud-client.

commit 52a47e705134df0c2a737a4b3e994308e8a7ddf4
Merge: 3371621 e663355
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Feb 8 18:26:33 2016 +0100

    Merge branch 'master' into experimental

 .tag                                           |   2 +-
 ChangeLog                                      |   6 +-
 VERSION.cmake                                  |   2 +-
 csync/src/csync_update.c                       |  55 ++++++++++--
 debian/changelog                               |   4 +-
 doc/building.rst                               | 115 ++++++++++++-------------
 doc/conf.py.in                                 |   2 +
 shell_integration/nautilus/createnemoplugin.sh |   6 ++
 src/gui/folderwatcher_mac.cpp                  |   2 +-
 src/libsync/CMakeLists.txt                     |   7 +-
 src/libsync/accessmanager.cpp                  |   4 -
 src/libsync/creds/httpcredentials.cpp          |   1 -
 src/libsync/creds/tokencredentials.cpp         |   8 +-
 src/libsync/creds/tokencredentials.h           |   3 +-
 src/libsync/discoveryphase.cpp                 |   3 -
 translations/client_de.ts                      |   2 +-
 translations/client_fr.ts                      |  10 +--
 translations/client_ja.ts                      |   4 +-
 translations/client_ru.ts                      |   2 +-
 19 files changed, 146 insertions(+), 92 deletions(-)

diff --cc debian/changelog
index dc5474e,49cd471..e59a939
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,14 -2,8 +2,14 @@@ owncloud-client (2.1.1~rc2+dfsg-0) UNRE
  
    * New upstream release.
  
-  -- Sandro Knauß <bugs at sandroknauss.de>  Fri, 05 Feb 2016 14:36:03 +0100
+  -- Sandro Knauß <bugs at sandroknauss.de>  Mon, 08 Feb 2016 18:14:19 +0100
  
 +owncloud-client (2.1.0+dfsg-2) experimental; urgency=medium
 +
 +  * Add dolphin plugin.
 +
 + -- Sandro Knauß <bugs at sandroknauss.de>  Sun, 24 Jan 2016 02:32:02 +0100
 +
  owncloud-client (2.1.0+dfsg-1) unstable; urgency=medium
  
    * New upstream release.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git