[Pkg-owncloud-commits] [owncloud-client] 429/498: Merge branch 'new_nsis_modules'

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 51a41901921898c3ad4ecd898a6855ba38a4a099
Merge: d51bd94 f66ebb2
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Sat Aug 1 18:47:26 2015 +0200

    Merge branch 'new_nsis_modules'

 admin/win/nsi/l10n/English.nsh          |  1 +
 admin/win/nsi/l10n/declarations.nsh     |  1 +
 admin/win/nsi/l10n/pofiles/messages.pot |  4 ++
 cmake/modules/NSIS.template.in          | 97 ++++++++++++++++-----------------
 cmake/modules/oc.nsi                    |  1 +
 5 files changed, 53 insertions(+), 51 deletions(-)

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