[Pkg-owncloud-commits] [owncloud-client] 77/78: Merge tag 'upstream/2.2.2+dfsg'

[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 b4ca1b20020711e381e1c9c7e67d5927eb63cccc
Merge: cdc21c1 8d304c4
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Jun 24 18:14:39 2016 +0200

    Merge tag 'upstream/2.2.2+dfsg'
    
    Upstream version 2.2.2+dfsg
    
    # gpg: Unterschrift vom Fr 24 Jun 2016 18:14:33 CEST
    # gpg:                mittels RSA-Schlüssel 0xE3ADB00850605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                          |  2 +-
 ChangeLog                     |  5 +++++
 VERSION.cmake                 |  2 +-
 csync/src/csync_exclude.c     | 16 +++++++++++++++-
 src/gui/folder.cpp            |  4 ++++
 src/gui/main.cpp              |  7 +++++--
 src/libsync/excludedfiles.cpp |  2 +-
 src/libsync/excludedfiles.h   |  5 +++--
 8 files changed, 35 insertions(+), 8 deletions(-)

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