[scummvm-tools] 02/08: Merge tag 'upstream/2.0.0'

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository scummvm-tools.

commit 1ea5b6150b5a86a35b129df9bf86dd805e3e38e4
Merge: c47a5c6 7463cce
Author: Stephen Kitt <skitt at debian.org>
Date:   Sat Dec 9 13:30:29 2017 +0100

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0

 COPYRIGHT                          |   2 +-
 NEWS                               |   7 +
 README                             | 169 ++++++++------
 convert_dxa.bat                    |   2 +-
 convert_dxa.sh                     |   2 +-
 dists/macosx/Info.plist            |   8 +-
 dists/macosx/Info.plist.in         |   4 +-
 dists/scummvmtools.rc              |  10 +-
 dists/scummvmtools.rc.in           |   2 +-
 dists/win32/ScummVM Tools.iss      |   2 +-
 dists/win32/scummvm-tools.nsi      |   6 +-
 dists/win32/scummvm-tools.nsi.in   |   2 +-
 engines/cine/extract_cine.cpp      |  11 +-
 engines/prince/extract_prince.cpp  | 463 +++++++++++++++++++++----------------
 engines/prince/extract_prince.h    |   1 +
 engines/prince/pack_prince.cpp     |  75 +++---
 engines/touche/compress_touche.cpp |   5 +-
 gui/main.cpp                       |   2 +-
 internal_version.h                 |   2 +-
 19 files changed, 448 insertions(+), 327 deletions(-)

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