[Pkg-owncloud-commits] [owncloud-client] 25/27: Imported Upstream version 1.6.2+dfsg
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Jul 29 16:23:59 UTC 2014
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 a3a25ebfc8bdb310c929ebf9c86dc0aaa3a640e7
Merge: 1e78618 0f37484
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Tue Jul 29 17:22:29 2014 +0200
Imported Upstream version 1.6.2+dfsg
.tag | 2 +-
ChangeLog | 15 ++++++++
VERSION.cmake | 2 +-
cmake/modules/NSIS.template.in | 10 ++---
src/creds/httpcredentials.cpp | 50 +++++++++++++++++++------
src/creds/httpcredentials.h | 1 +
src/creds/shibboleth/shibbolethwebview.cpp | 14 ++++++-
src/creds/shibboleth/shibbolethwebview.h | 1 +
src/mirall/folder.cpp | 5 +--
src/mirall/owncloudpropagator.cpp | 9 ++++-
src/mirall/owncloudsetupwizard.cpp | 22 ++++++++++-
src/mirall/owncloudsetupwizard.h | 1 +
src/mirall/propagator_legacy.cpp | 49 ++++++++++++++++++------
src/mirall/propagator_legacy.h | 6 ++-
src/mirall/propagator_qnam.cpp | 60 ++++++++++++++++++++++++++----
src/mirall/propagator_qnam.h | 11 +++---
src/mirall/protocolwidget.cpp | 7 ++++
src/mirall/syncengine.cpp | 25 +++++++------
src/mirall/syncengine.h | 3 +-
19 files changed, 227 insertions(+), 66 deletions(-)
diff --cc .tag
index 4d9bbbe,6828f88..334fd8f
--- a/.tag
+++ b/.tag
@@@ -1,1 -1,1 +1,1 @@@
- 40d765c73aa64de2fcf8503886f27c8da7b7d3d9
-$Format:%H$
++0f37484b8a708dacba99697cf5bb17e1b2b6d5e2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list