[Pkg-owncloud-commits] [owncloud-client] 90/332: Merge remote-tracking branch 'origin/1.6' into 'il'

[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 2f361278d20d7d0cc4fd236b3aa1018368552af1
Merge: 319cf76 2d234cd
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Jun 16 16:41:48 2014 +0200

    Merge remote-tracking branch 'origin/1.6' into 'il'

 csync/config_csync.h.cmake                 |  2 +-
 src/creds/shibboleth/shibbolethwebview.cpp |  1 -
 src/creds/shibboleth/shibbolethwebview.h   |  2 +-
 src/creds/shibbolethcredentials.cpp        |  2 +-
 src/mirall/accountsettings.cpp             |  2 --
 src/mirall/folderwizard.cpp                | 11 ++-------
 src/mirall/folderwizard.h                  |  5 +----
 src/mirall/propagator_qnam.cpp             | 36 +++++++++++++++++++++---------
 src/mirall/theme.cpp                       |  2 +-
 src/wizard/owncloudshibbolethcredspage.cpp |  5 ++---
 10 files changed, 35 insertions(+), 33 deletions(-)


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