[Pkg-owncloud-commits] [qtkeychain] 06/63: Merge pull request #70 from OpendTect/master

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository qtkeychain.

commit 75b80547fb1898dffa70c2a7e1bbe4d3af4e600b
Merge: 1e7ffaf 0786ed6
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Thu Apr 7 17:05:38 2016 +0200

    Merge pull request #70 from OpendTect/master
    
    Added option to make translations optional.

 .gitignore     | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 CMakeLists.txt | 59 +++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 83 insertions(+), 23 deletions(-)

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