[planetblupi] 22/29: Merge tag 'upstream/1.12.1-22-g13a7e27' into debian/master

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit f76c9af19cddb942e88a818b61250787820eb1f2
Merge: 0a38b1c 13a7e27
Author: Didier Raboud <odyx at debian.org>
Date:   Sun Dec 31 10:39:28 2017 +0100

    Merge tag 'upstream/1.12.1-22-g13a7e27' into debian/master

 CMakeLists.txt               |   5 +-
 LICENSE                      |   3 +
 LICENSE.all                  | 239 +++++++++++++++++++++++++++++++++++++++++++
 README-user.md               |  44 +++++++-
 resources/image/setup00.png  | Bin 217338 -> 209119 bytes
 resources/music/music000.ogg | Bin 0 -> 12724663 bytes
 resources/music/music001.ogg | Bin 0 -> 12472314 bytes
 resources/music/music002.ogg | Bin 0 -> 12009171 bytes
 resources/music/music003.ogg | Bin 0 -> 9254922 bytes
 resources/music/music004.ogg | Bin 0 -> 4854247 bytes
 resources/music/music005.ogg | Bin 0 -> 4710862 bytes
 resources/music/music006.ogg | Bin 0 -> 4602855 bytes
 resources/music/music007.ogg | Bin 0 -> 4800059 bytes
 resources/music/music008.ogg | Bin 0 -> 4853980 bytes
 resources/music/music009.ogg | Bin 0 -> 4509020 bytes
 resources/po/de.po           |  29 +++++-
 resources/po/en_US.po        |  25 ++++-
 resources/po/fr.po           |  32 +++++-
 resources/po/it.po           |  29 +++++-
 resources/po/pl.po           |  31 +++++-
 resources/po/planetblupi.pot |  25 ++++-
 src/blupi.cxx                |  89 +++++++++++-----
 src/blupi.h                  |  14 +++
 src/event.cxx                | 145 +++++++++++++++++---------
 src/event.h                  |   7 +-
 src/menu.cxx                 |   4 +-
 src/misc.cxx                 |  30 ++++++
 src/misc.h                   |   5 +
 src/movie.cxx                |  16 ---
 src/sound.cxx                |   9 +-
 30 files changed, 660 insertions(+), 121 deletions(-)

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