[Pkg-owncloud-commits] [owncloud-client] 02/09: Merge tag 'upstream/1.4.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 abb4e8de137073d3af4f86bf78553529388847c6
Merge: de3e7ab c828cb7
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Oct 21 23:06:39 2013 +0200

    Merge tag 'upstream/1.4.2+dfsg'
    
    Upstream version 1.4.2+dfsg
    
    # gpg: Unterschrift vom Mo 21 Okt 2013 23:06:38 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                    |    2 +-
 ChangeLog                               |   16 +++++++
 VERSION.cmake                           |    2 +-
 src/mirall/accountsettings.cpp          |   37 ++++++++++++----
 src/mirall/accountsettings.h            |    2 +-
 src/mirall/application.cpp              |   19 ++++++--
 src/mirall/application.h                |    1 +
 src/mirall/connectionvalidator.cpp      |    9 +++-
 src/mirall/connectionvalidator.h        |    2 +
 src/mirall/csyncthread.cpp              |    2 +-
 src/mirall/folder.cpp                   |   73 ++++++++++++++++++++++++-------
 src/mirall/folder.h                     |   12 +++++
 src/mirall/folderman.cpp                |   25 ++++++-----
 src/mirall/folderman.h                  |    5 +--
 src/mirall/folderstatusmodel.cpp        |    9 ++--
 src/mirall/folderwatcher.cpp            |    2 +-
 src/mirall/folderwatcher_inotify.cpp    |   11 ++++-
 src/mirall/inotify.cpp                  |    1 +
 src/mirall/itemprogressdialog.cpp       |   10 +++--
 src/mirall/progressdispatcher.cpp       |    6 +++
 src/mirall/progressdispatcher.h         |    3 ++
 src/wizard/owncloudsetupnocredspage.ui  |    2 +-
 src/wizard/owncloudsetuppage.cpp        |    5 ++-
 src/wizard/owncloudwizardresultpage.cpp |    3 +-
 24 files changed, 198 insertions(+), 61 deletions(-)

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