[Pkg-owncloud-commits] [qtkeychain] 15/16: Merge tag 'upstream/0.4.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 9be184d9092864db80ff77d6484096792738c6c9
Merge: c069ec3 9d68086
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed Sep 3 13:51:56 2014 +0200

    Merge tag 'upstream/0.4.0'
    
    Upstream version 0.4.0
    
    # gpg: Unterschrift vom Mi 03 Sep 2014 13:51:49 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 CMakeLists.txt                |  4 +-
 ChangeLog                     |  4 ++
 gnomekeyring.cpp              | 15 +++++---
 gnomekeyring_p.h              |  6 ++-
 keychain_p.h                  |  2 +
 keychain_unix.cpp             | 85 ++++++++++++++++++++++++++++++++++++++++---
 translations/qtkeychain_de.ts | 52 +++++++++++++-------------
 translations/qtkeychain_ro.ts | 52 +++++++++++++-------------
 8 files changed, 155 insertions(+), 65 deletions(-)

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