[Pkg-owncloud-commits] [qtkeychain] 87/115: Merge pull request #24 from danimo/target_qt5

[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 9a27ddd1102cc0e51ba360db417224f25bcf93ae
Merge: e518815 23396db
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Wed Nov 13 08:04:24 2013 -0800

    Merge pull request #24 from danimo/target_qt5
    
    When using Qt5 for compilation, name target qt5keychain

 CMakeLists.txt            | 46 +++++++++++++++++++++++++---------------------
 QtKeychainConfig.cmake.in |  6 +++---
 2 files changed, 28 insertions(+), 24 deletions(-)

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