Merge branch 'gpg4win-2'
authorAndre Heinecke <aheinecke@intevation.de>
Wed, 9 Sep 2015 14:35:59 +0000 (16:35 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Wed, 9 Sep 2015 14:35:59 +0000 (16:35 +0200)
commit4c93ede23cc5eac77076ba62d7e773c06834f9c6
tree2009eb16834d1fbbdf0a21cd04fc8568aeb56051
parent7462799c1b4065414b1ca2ff36f7c32907810e1b
parent04a5578c17d4f3ec98b80df22db180338cb002b1
Merge branch 'gpg4win-2'

Conflicts:
Makefile.am
NEWS
configure.ac
packages/packages.current
patches/gnupg2-2.0.29/
0001-Enable-wildcard-expansion-with-mingw-w64.patch
patches/gnupg2-2.0.29/
0002-Let-wchar_to_native-convert-to-console-codepage.patch
patches/gnupg2-2.0.29/
0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch
patches/gnupg2-2.0.29/
0006-gpgsm-Add-command-option-offline.patch
Makefile.am
NEWS
configure.ac
packages/packages.current