[Pkg-owncloud-commits] [qtkeychain] 14/17: Merge tag 'upstream/0.5.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 qtkeychain.

commit 6fa5a82db736cd7b49b83dd2e9dcb192e1ed7093
Merge: e6e63b2 6640c5a
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Jun 1 19:36:55 2015 +0200

    Merge tag 'upstream/0.5.0'
    
    Upstream version 0.5.0
    
    # gpg: Unterschrift vom Mo 01 Jun 2015 19:36:49 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 CMakeLists.txt    |   2 +-
 ChangeLog         |   3 ++
 keychain.cpp      |   2 +-
 keychain.h        |   2 +-
 keychain_mac.cpp  |   2 +-
 keychain_p.h      |   2 +-
 keychain_unix.cpp | 114 ++++++++++++++++++++++++++++++++----------------------
 keychain_win.cpp  |   2 +-
 testclient.cpp    |   2 +-
 9 files changed, 77 insertions(+), 54 deletions(-)

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