[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.2-9-g800737c

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  800737c3d58ddfb2d9faff3c177374cb36f1d2e1 (commit)
      from  1c9fd401222cf5676818bc9bfaa88e85577388a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 800737c3d58ddfb2d9faff3c177374cb36f1d2e1
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Jan 11 08:44:48 2018 +0100

    Fix kleo patch
    
    --

diff --git a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
index 88df47e..b0974dd 100755
--- a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
+++ b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
@@ -228,7 +228,7 @@ diff --git a/src/fileoperationspreferences.cpp b/src/fileoperationspreferences.c
 new file mode 100644
 index 0000000..d2d20fc
 --- /dev/null   2018-01-08 07:35:44.039369717 +0100
-+++ src/fileoperationspreferences.cpp   2018-01-09 15:42:01.999936689 +0100
++++ b/src/fileoperationspreferences.cpp   2018-01-09 15:42:01.999936689 +0100
 @@ -0,0 +1,33 @@
 +// This file is generated by kconfig_compiler_kf5 from fileoperationspreferences.kcfg.
 +// All changes you do to this file will be lost.
@@ -267,7 +267,7 @@ diff --git a/src/fileoperationspreferences.h b/src/fileoperationspreferences.h
 new file mode 100644
 index 0000000..9866a70
 --- /dev/null   2018-01-08 07:35:44.039369717 +0100
-+++ src/fileoperationspreferences.h     2018-01-09 15:42:01.995936609 +0100
++++ b/src/fileoperationspreferences.h     2018-01-09 15:42:01.995936609 +0100
 @@ -0,0 +1,120 @@
 +// This file is generated by kconfig_compiler_kf5 from fileoperationspreferences.kcfg.
 +// All changes you do to this file will be lost.

-----------------------------------------------------------------------

Summary of changes:
 .../kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org