[Pkg-owncloud-commits] [owncloud-client] 52/470: Merge branch '2.1'

[Sandro Knauß]

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

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

commit 28b694b17028665564b6d4640d0322fe225b0db0
Merge: 64ca8a6 74f74e0
Author: Hefee <hefee at netzguerilla.net>
Date:   Sat Feb 20 10:34:34 2016 +0100

    Merge branch '2.1'

 csync/src/csync.h                   |  34 +++++++++++++++++-----------------
 csync/src/csync_exclude.h           |   2 +-
 csync/src/csync_statedb.h           |   2 +-
 csync/src/std/c_rbtree.h            |  24 ++++++++++++------------
 doc/images/client-8.png             | Bin 83622 -> 73618 bytes
 doc/images/client-9.png             | Bin 53065 -> 87985 bytes
 doc/images/menu.png                 | Bin 101298 -> 23242 bytes
 doc/introduction.rst                |  10 +++++++++-
 doc/navigating.rst                  |  19 ++++++++++++-------
 src/gui/selectivesyncdialog.cpp     |   2 +-
 src/libsync/connectionvalidator.cpp |   2 +-
 src/libsync/networkjobs.cpp         |   2 +-
 src/libsync/networkjobs.h           |   2 +-
 src/libsync/syncjournaldb.cpp       |   7 +++++++
 14 files changed, 63 insertions(+), 43 deletions(-)


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