[Pkg-owncloud-commits] [owncloud-client] 120/219: Merge pull request #2214 from owncloud/2211

[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 db3318886e5edb4710b3b83ef636537bde4de83e
Merge: 0bd7378 54eb837
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Thu Sep 18 00:09:26 2014 +0200

    Merge pull request #2214 from owncloud/2211
    
    Implement (most of) #2211

 src/CMakeLists.txt                   |   2 +-
 src/creds/credentialsfactory.cpp     |   2 +-
 src/creds/httpcredentials.cpp        |  33 ++++----
 src/creds/httpcredentials.h          |  13 ++-
 src/owncloudcmd/netrcparser.cpp      |  97 +++++++++++++++++++++
 src/owncloudcmd/netrcparser.h        |  41 +++++++++
 src/owncloudcmd/owncloudcmd.cpp      | 160 +++++++++++++++++++++++++++--------
 src/wizard/owncloudhttpcredspage.cpp |   2 +-
 test/CMakeLists.txt                  |   1 +
 test/testnetrcparser.h               |  76 +++++++++++++++++
 10 files changed, 371 insertions(+), 56 deletions(-)

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