[Pkg-owncloud-commits] [qtkeychain] 44/115: Merge pull request #3 from lfranchi/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 be7f9c6dee98ad86a8e0ee608b5a04976c9211c4
Merge: 42db0f2 89eb6be
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Sun Jul 29 13:00:22 2012 -0700

    Merge pull request #3 from lfranchi/master
    
    Add cmake config files and insecure fallback for kwallet.

 CMakeLists.txt                       | 38 ++++++++++++++--
 QtKeychainBuildTreeSettings.cmake.in |  4 ++
 QtKeychainConfig.cmake.in            | 20 ++++++++
 QtKeychainConfigVersion.cmake.in     | 11 +++++
 keychain.cpp                         |  8 ++++
 keychain.h                           |  3 ++
 keychain_dbus.cpp                    | 88 ++++++++++++++++++++++++++++++++++--
 keychain_p.h                         |  4 +-
 8 files changed, 167 insertions(+), 9 deletions(-)

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