[freecol] 100/125: Merge tag 'upstream/0.11.6+dfsg'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freecol.

commit 18ececb6adc4151d17e1e016a3adb7e8c709f228
Merge: 53f8842 f812572
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 20 05:51:11 2015 +0100

    Merge tag 'upstream/0.11.6+dfsg'
    
    Upstream version 0.11.6+dfsg
    
    # gpg: Unterschrift vom So 20 Dez 2015 05:51:08 CET mittels RSA-Schlüssel ID 513B51E4
    # gpg: Korrekte Unterschrift von "Markus Koschany <apo at gambaru.de>" [uneingeschränkt]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [uneingeschränkt]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [uneingeschränkt]

 build/bin/native/izpack/ShellLink.dll              | Bin 53248 -> 0 bytes
 build/bin/native/izpack/ShellLink_x64.dll          | Bin 50176 -> 0 bytes
 build/skeletons/console-wrapper/consolewrapper.exe | Bin 392192 -> 0 bytes
 build/skeletons/windowed-wrapper/jwrap.exe         | Bin 401920 -> 0 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

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