[Pkg-owncloud-commits] [qtkeychain] 62/115: Merge pull request #13 from xhochy/fix-kwallet-earlier-dbus-fallback

[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 dcfebad35d98fefd221580cec9aa5a312cfaa75e
Merge: fc35675 4556eb0
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Sat Jun 15 02:32:38 2013 -0700

    Merge pull request #13 from xhochy/fix-kwallet-earlier-dbus-fallback
    
    Fallback earlier if D-Bus is not available

 keychain_dbus.cpp | 141 ++++++++++++++++++++++++++++++++++--------------------
 keychain_p.h      |   5 +-
 2 files changed, 93 insertions(+), 53 deletions(-)

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