[berusky] 15/31: Merge tag 'upstream/1.7'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository berusky.

commit 725c3846ebe0bc75aa04adbfbd20fae21d844934
Merge: 7b64056 b154c0d
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jun 12 11:16:29 2016 +0200

    Merge tag 'upstream/1.7'
    
    Upstream version 1.7
    
    # gpg: Signature made Sun 12 Jun 2016 11:16:25 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 ChangeLog                  |   14 +
 INSTALL                    |   15 +-
 Makefile.in                |  235 +++--
 NEWS                       |    1 -
 TODO                       |   73 +-
 aclocal.m4                 |  730 +++++++++-----
 configure                  |  774 ++++++++-------
 configure.in               |    4 +-
 data/Makefile.in           |   62 +-
 depcomp                    |  189 ++--
 install-sh                 |   35 +-
 ltmain.sh                  |   93 +-
 missing                    |  148 +--
 mkinstalldirs              |    4 +-
 po/Makefile.in.in          |    7 +-
 po/POTFILES.in             |    3 +
 po/berusky.pot             |  839 ++++++++--------
 src/2d_graph.cpp           |  612 ++++++++++--
 src/2d_graph.h             |  205 +++-
 src/Makefile.am            |   10 +-
 src/Makefile.in            |  103 +-
 src/animation.cpp          |   13 +-
 src/berusky.cpp            |  142 ++-
 src/berusky.h              |   65 ++
 src/berusky_gui.cpp        | 2279 ++++++++++++++++++++++++++++++++++----------
 src/berusky_gui.h          |   73 +-
 src/data_parser_tables.cpp |   27 +
 src/defines.h              |  144 ++-
 src/editor.cpp             | 1027 +++++++++++++-------
 src/editor.h               |  469 ++++-----
 src/events.cpp             |   52 +-
 src/events.h               |  120 ++-
 src/game_logic.cpp         |   33 +-
 src/graphics.cpp           |   90 +-
 src/graphics.h             |  115 ++-
 src/gui.cpp                |  432 ++++++---
 src/gui.h                  |  207 +++-
 src/ini.cpp                |   76 ++
 src/ini.h                  |    1 +
 src/input.cpp              |   79 +-
 src/input.h                |   59 +-
 src/level.cpp              |    4 +-
 src/level_active.cpp       |   59 +-
 src/level_active.h         |    3 +-
 src/level_game.cpp         |   44 +-
 src/level_game.h           |   30 +-
 src/llist.h                |  190 ++++
 src/main.cpp               |  235 +----
 src/main.h                 |   17 +-
 src/portability.h          |    6 +-
 src/profile.cpp            |  176 ++++
 src/profile.h              |   97 ++
 src/types.h                |    1 +
 src/utils.cpp              |  536 ++++++++++-
 src/utils.h                |   57 +-
 55 files changed, 7902 insertions(+), 3212 deletions(-)

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