[oolite] 03/11: Merge branch 'upstream'

[Nicolas Boulenguez]

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

nicobou-guest pushed a commit to branch master
in repository oolite.

commit 8aa61b1eae6a9f0e31fb527f23f6c025c3ec17a4
Merge: b57c4e8 57a7cd8
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Sat Oct 11 22:14:11 2014 +0200

    Merge branch 'upstream'

 src/Core/MiniZip/MiniZip64_info.txt |   74 --
 src/Core/MiniZip/ioapi.c            |  242 ----
 src/Core/MiniZip/ioapi.h            |  200 ----
 src/Core/MiniZip/unzip.c            | 2137 -----------------------------------
 src/Core/MiniZip/unzip.h            |  437 -------
 5 files changed, 3090 deletions(-)

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