[Pkg-owncloud-commits] [qtkeychain] 01/17: Merge pull request #44 from WeCodePixels/master

[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 6954c941b37fd544bbd1e91d689757bf6ebc30a2
Merge: a2437ac 0c37667
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Mon Aug 18 10:29:11 2014 +0200

    Merge pull request #44 from WeCodePixels/master
    
    Don't request a new kwallet if there already is one

 keychain_p.h                  |  2 ++
 keychain_unix.cpp             | 13 +++++++++--
 translations/qtkeychain_de.ts | 52 +++++++++++++++++++++----------------------
 translations/qtkeychain_ro.ts | 52 +++++++++++++++++++++----------------------
 4 files changed, 65 insertions(+), 54 deletions(-)

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