[rbdoom3bfg] 04/06: Merge tag 'upstream/1.0.3+repack1'

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit e1e531bf027a2b2c48c52ac21374aaaad4508c72
Merge: 7307d39 4d8a13b
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Wed Mar 11 11:25:15 2015 +0100

    Merge tag 'upstream/1.0.3+repack1'
    
    Upstream version 1.0.3+repack1
    
    # gpg: Unterschrift vom Mi 11 Mär 2015 11:25:15 CET mittels RSA-Schlüssel ID 17BD5D36
    # gpg: Korrekte Unterschrift von "Tobias Frost <tobi at coldtobi.de>"
    # gpg:                     alias "Tobias Frost <tobi at frost.de>"
    # gpg:                     alias "[jpeg image of size 5939]"
    # gpg:                     alias "Tobias Frost <tobi at debian.org>"

 neo/libs/zlib/minizip/ioapi.c | 250 +++++++++++++++++++++++
 neo/libs/zlib/minizip/ioapi.h | 211 ++++++++++++++++++++
 neo/libs/zlib/minizip/unzip.h | 454 ++++++++++++++++++++++++++++++++++++++++++
 neo/libs/zlib/minizip/zip.h   | 362 +++++++++++++++++++++++++++++++++
 4 files changed, 1277 insertions(+)

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