[Pkg-owncloud-commits] [owncloud-client] 02/12: Merge tag 'upstream/1.4.1+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 7cb93e261e99d867044581c50688d161d4017217
Merge: 5ab4b19 125d803
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu Sep 26 19:53:50 2013 +0200

    Merge tag 'upstream/1.4.1+dfsg'
    
    Upstream version 1.4.1+dfsg
    
    # gpg: Unterschrift vom Do 26 Sep 2013 19:53:49 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                     |    2 +-
 ChangeLog                                |   22 +++++++
 VERSION.cmake                            |    2 +-
 config.h.in                              |    1 +
 doc/CMakeLists.txt                       |    2 +-
 doc/building.rst                         |    7 ++-
 doc/conf.py.in                           |    2 +-
 mirall.desktop.in                        |    2 +-
 src/CMakeLists.txt                       |   16 +++--
 src/creds/httpcredentials.cpp            |   51 ++++++++--------
 src/creds/httpcredentials.h              |    1 -
 src/main.cpp                             |   30 +++++++---
 src/mirall/accountsettings.cpp           |   94 ++++++++++++++++++++++--------
 src/mirall/accountsettings.h             |    6 +-
 src/mirall/application.cpp               |   93 +++++++++++++++++------------
 src/mirall/application.h                 |    8 +--
 src/mirall/connectionvalidator.cpp       |   11 ++--
 src/mirall/folder.cpp                    |   19 +++---
 src/mirall/folderman.cpp                 |   10 +++-
 src/mirall/folderstatusmodel.cpp         |   24 ++++----
 src/mirall/folderwizard.cpp              |   31 +++++++---
 src/mirall/folderwizard.h                |    3 +
 src/mirall/logbrowser.cpp                |    5 ++
 src/mirall/logbrowser.h                  |    3 +
 src/mirall/owncloudinfo.cpp              |   10 +++-
 src/mirall/owncloudsetupwizard.cpp       |    9 ++-
 src/mirall/settingsdialog.cpp            |   39 ++++++++++++-
 src/mirall/settingsdialog.h              |    6 +-
 src/mirall/settingsdialog.ui             |   17 +-----
 src/mirall/sslerrordialog.h              |    8 +--
 src/mirall/sslerrordialog.ui             |    4 +-
 src/mirall/syncfileitem.h                |   13 +++++
 src/mirall/utility.cpp                   |   18 ++++--
 src/mirall/utility.h                     |    1 +
 src/wizard/owncloudadvancedsetuppage.cpp |    6 +-
 test/testutility.h                       |   24 ++++----
 theme/colored/owncloud-icon-22.png       |  Bin 739 -> 781 bytes
 37 files changed, 408 insertions(+), 192 deletions(-)

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