[Pkg-owncloud-commits] [owncloud-client] 206/484: Merge branch '2.0'

[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 46269dac4eb9ce78a7bfc77edb8a9126ccb469cc
Merge: a127deb bc5890d
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Oct 29 16:34:15 2015 +0100

    Merge branch '2.0'
    
    Conflicts:
    	ChangeLog

 ChangeLog                  | 64 +++++++++++++++++++++++-----------------------
 src/libsync/configfile.cpp |  6 +----
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --cc ChangeLog
index 274735b,783f4e6..3ad7a3b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,6 +1,12 @@@
  ChangeLog
  =========
 +version 2.1 (release 2015-yy-zz)
 + * We removed the old libneon-based propagator.
 +   It was already disabled on OS X and Windows and only used on
 +   Linux when building with Qt < 5.4 and having bandwidth limiting enabled.
 +   So now you need Qt 5.4 on Linux if you want bandwidth limiting.
 +
- version 2.0.2 (release 2015-10-22)
+ version 2.0.2 (release 2015-10-21)
    * csync_file_stat_s: Save a bit of memory
    * Shibboleth: Add our base user agent to WebKit
    * SelectiveSync: Increase folder list timeout to 60

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