[powermanga] 04/07: Merge tag 'upstream/0.93.1'
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Jun 30 13:44:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository powermanga.
commit 28fc9520383fb56792577c995f6883661a7d4d58
Merge: 72c06b2 e7e39c6
Author: Markus Koschany <apo at gambaru.de>
Date: Tue Jun 30 11:26:02 2015 +0200
Merge tag 'upstream/0.93.1'
Upstream version 0.93.1
# gpg: Signature made Tue 30 Jun 2015 11:25:55 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]
CHANGES | 20 ++-
autotools/config.guess | 192 +++------------------
autotools/config.sub | 30 ++--
configure.ac | 6 +-
html/powermanga_en/ar01s01.html | 0
html/powermanga_en/ar01s01s01.html | 0
html/powermanga_en/ar01s01s02.html | 0
html/powermanga_en/ar01s02.html | 0
html/powermanga_en/ar01s02s01.html | 0
html/powermanga_en/ar01s02s02.html | 0
html/powermanga_en/ar01s02s03.html | 0
html/powermanga_en/ar01s02s04.html | 0
html/powermanga_en/ar01s02s05.html | 0
html/powermanga_en/ar01s03.html | 0
html/powermanga_en/ar01s03s01.html | 0
html/powermanga_en/ar01s03s02.html | 0
html/powermanga_en/ar01s03s03.html | 0
html/powermanga_en/ar01s03s03s01.html | 0
html/powermanga_en/ar01s03s03s02.html | 0
html/powermanga_en/ar01s03s03s03.html | 0
html/powermanga_en/ar01s03s03s04.html | 0
html/powermanga_en/ar01s04.html | 0
html/powermanga_en/ar01s04s01.html | 0
html/powermanga_en/ar01s04s02.html | 0
html/powermanga_en/ar01s04s03.html | 0
html/powermanga_en/ar01s05.html | 0
html/powermanga_en/ar01s05s01.html | 0
html/powermanga_en/ar01s05s02.html | 0
html/powermanga_en/ar01s05s03.html | 0
html/powermanga_en/ar01s05s04.html | 0
html/powermanga_en/ar01s05s05.html | 0
html/powermanga_en/ar01s06.html | 0
html/powermanga_en/ar01s06s01.html | 0
html/powermanga_en/ar01s06s01s01.html | 0
html/powermanga_en/ar01s06s01s02.html | 0
html/powermanga_en/ar01s06s01s03.html | 0
html/powermanga_en/ar01s06s02.html | 0
html/powermanga_en/ar01s06s02s01.html | 0
html/powermanga_en/ar01s06s02s02.html | 0
html/powermanga_en/ar01s07.html | 0
html/powermanga_en/ar01s08.html | 0
html/powermanga_en/ar01s08s01.html | 0
html/powermanga_en/ar01s08s02.html | 0
html/powermanga_en/ar01s08s02s01.html | 0
html/powermanga_en/ar01s08s02s02.html | 0
html/powermanga_en/ar01s08s02s03.html | 0
html/powermanga_en/ar01s08s02s04.html | 0
html/powermanga_en/ar01s09.html | 0
html/powermanga_en/images/home.png | Bin
html/powermanga_en/images/next.png | Bin
html/powermanga_en/images/prev.png | Bin
html/powermanga_en/images/tlktop.png | Bin
html/powermanga_en/images/up.png | Bin
html/powermanga_en/index.html | 0
.../powermanga_en_fichiers/filelist.xml | 0
.../powermanga_en_fichiers/image001.gif | Bin
.../powermanga_en_fichiers/image002.gif | Bin
.../powermanga_en_fichiers/image003.gif | Bin
.../powermanga_en_fichiers/image004.gif | Bin
.../powermanga_en_fichiers/image005.gif | Bin
.../powermanga_en_fichiers/image006.gif | Bin
.../powermanga_en_fichiers/image007.jpg | Bin
.../powermanga_en_fichiers/image008.jpg | Bin
.../powermanga_en_fichiers/image009.jpg | Bin
.../powermanga_en_fichiers/image010.gif | Bin
.../powermanga_en_fichiers/image011.gif | Bin
.../powermanga_en_fichiers/image012.gif | Bin
.../powermanga_en_fichiers/image013.jpg | Bin
.../powermanga_en_fichiers/image014.gif | Bin
.../powermanga_en_fichiers/image015.jpg | Bin
.../powermanga_en_fichiers/image016.gif | Bin
.../powermanga_en_fichiers/image017.jpg | Bin
.../powermanga_en_fichiers/image018.jpg | Bin
.../powermanga_en_fichiers/image019.jpg | Bin
.../powermanga_en_fichiers/image020.jpg | Bin
.../powermanga_en_fichiers/image021.jpg | Bin
.../powermanga_en_fichiers/image022.jpg | Bin
.../powermanga_en_fichiers/image023.jpg | Bin
.../powermanga_en_fichiers/image024.jpg | Bin
.../powermanga_en_fichiers/image025.jpg | Bin
.../powermanga_en_fichiers/image026.jpg | Bin
.../powermanga_en_fichiers/image027.jpg | Bin
.../powermanga_en_fichiers/image028.jpg | Bin
.../powermanga_en_fichiers/image029.jpg | Bin
html/powermanga_en/style.css | 0
html/powermanga_fr/ar01s01.html | 0
html/powermanga_fr/ar01s01s01.html | 0
html/powermanga_fr/ar01s01s02.html | 0
html/powermanga_fr/ar01s02.html | 0
html/powermanga_fr/ar01s02s01.html | 0
html/powermanga_fr/ar01s02s02.html | 0
html/powermanga_fr/ar01s02s03.html | 0
html/powermanga_fr/ar01s02s04.html | 0
html/powermanga_fr/ar01s02s05.html | 0
html/powermanga_fr/ar01s03.html | 0
html/powermanga_fr/ar01s03s01.html | 0
html/powermanga_fr/ar01s03s02.html | 0
html/powermanga_fr/ar01s03s03.html | 0
html/powermanga_fr/ar01s03s03s01.html | 0
html/powermanga_fr/ar01s03s03s02.html | 0
html/powermanga_fr/ar01s03s03s03.html | 0
html/powermanga_fr/ar01s03s03s04.html | 0
html/powermanga_fr/ar01s03s03s05.html | 0
html/powermanga_fr/ar01s04.html | 0
html/powermanga_fr/ar01s04s01.html | 0
html/powermanga_fr/ar01s04s02.html | 0
html/powermanga_fr/ar01s04s03.html | 0
html/powermanga_fr/ar01s05.html | 0
html/powermanga_fr/ar01s05s01.html | 0
html/powermanga_fr/ar01s05s02.html | 0
html/powermanga_fr/ar01s05s03.html | 0
html/powermanga_fr/ar01s05s04.html | 0
html/powermanga_fr/ar01s05s05.html | 0
html/powermanga_fr/ar01s06.html | 0
html/powermanga_fr/ar01s06s01.html | 0
html/powermanga_fr/ar01s06s02.html | 0
html/powermanga_fr/ar01s06s02s01.html | 0
html/powermanga_fr/ar01s06s02s02.html | 0
html/powermanga_fr/ar01s07.html | 0
html/powermanga_fr/ar01s08.html | 0
html/powermanga_fr/ar01s08s01.html | 0
html/powermanga_fr/ar01s08s02.html | 0
html/powermanga_fr/ar01s09.html | 0
html/powermanga_fr/images/home.png | Bin
html/powermanga_fr/images/next.png | Bin
html/powermanga_fr/images/prev.png | Bin
html/powermanga_fr/images/tlktop.png | Bin
html/powermanga_fr/images/up.png | Bin
html/powermanga_fr/index.html | 0
.../powermanga_fr_fichiers/filelist.xml | 0
.../powermanga_fr_fichiers/image001.gif | Bin
.../powermanga_fr_fichiers/image001.jpg | Bin
.../powermanga_fr_fichiers/image002.gif | Bin
.../powermanga_fr_fichiers/image002.jpg | Bin
.../powermanga_fr_fichiers/image003.gif | Bin
.../powermanga_fr_fichiers/image003.jpg | Bin
.../powermanga_fr_fichiers/image004.gif | Bin
.../powermanga_fr_fichiers/image004.jpg | Bin
.../powermanga_fr_fichiers/image005.gif | Bin
.../powermanga_fr_fichiers/image005.jpg | Bin
.../powermanga_fr_fichiers/image006.jpg | Bin
.../powermanga_fr_fichiers/image007.jpg | Bin
.../powermanga_fr_fichiers/image008.jpg | Bin
.../powermanga_fr_fichiers/image009.jpg | Bin
.../powermanga_fr_fichiers/image010.jpg | Bin
.../powermanga_fr_fichiers/image011.jpg | Bin
.../powermanga_fr_fichiers/image012.jpg | Bin
.../powermanga_fr_fichiers/image013.jpg | Bin
.../powermanga_fr_fichiers/image014.jpg | Bin
.../powermanga_fr_fichiers/image015.jpg | Bin
.../powermanga_fr_fichiers/image016.jpg | Bin
.../powermanga_fr_fichiers/image017.jpg | Bin
.../powermanga_fr_fichiers/image018.jpg | Bin
.../powermanga_fr_fichiers/image019.jpg | Bin
.../powermanga_fr_fichiers/image020.jpg | Bin
.../powermanga_fr_fichiers/image021.jpg | Bin
.../powermanga_fr_fichiers/image022.jpg | Bin
.../powermanga_fr_fichiers/image023.jpg | Bin
.../powermanga_fr_fichiers/image023.png | Bin
.../powermanga_fr_fichiers/image024.jpg | Bin
.../powermanga_fr_fichiers/image024.png | Bin
.../powermanga_fr_fichiers/image025.jpg | Bin
.../powermanga_fr_fichiers/image026.jpg | Bin
.../powermanga_fr_fichiers/image027.jpg | Bin
.../powermanga_fr_fichiers/image028.png | Bin
html/powermanga_fr/style.css | 0
man/powermanga.fr.6 | 127 +++++++-------
src/Makefile.am | 2 +
src/assembler.S | 2 +-
src/assembler.h | 2 +-
src/assembler_opt.S | 2 +-
src/bonus.c | 29 +++-
src/bonus.h | 5 +-
src/config_file.c | 64 ++++++-
src/config_file.h | 10 +-
src/congratulations.c | 2 +-
src/congratulations.h | 2 +-
src/counter_shareware.c | 2 +-
src/counter_shareware.h | 2 +-
src/curve_phase.c | 2 +-
src/curve_phase.h | 2 +-
src/display.c | 2 +-
src/display.h | 2 +-
src/display_sdl.c | 20 +--
src/display_x11.c | 2 +-
src/electrical_shock.c | 2 +-
src/electrical_shock.h | 2 +-
src/enemies.c | 2 +-
src/enemies.h | 2 +-
src/energy_gauge.c | 2 +-
src/energy_gauge.h | 2 +-
src/explosions.c | 2 +-
src/explosions.h | 2 +-
src/extra_gun.c | 2 +-
src/extra_gun.h | 2 +-
src/gfx_wrapper.c | 2 +-
src/gfx_wrapper.h | 2 +-
src/gfxroutines.h | 2 +-
src/grid_phase.c | 2 +-
src/grid_phase.h | 2 +-
src/guardians.c | 5 +-
src/guardians.h | 2 +-
src/images.c | 2 +-
src/images.h | 2 +-
src/inits_game.c | 2 +-
src/lispreader.c | 20 ++-
src/lispreader.h | 6 +-
src/log_recorder.c | 27 ++-
src/log_recorder.h | 12 +-
src/lonely_foes.c | 2 +-
src/lonely_foes.h | 2 +-
src/main.c | 2 +-
src/menu.c | 5 +-
src/menu.h | 5 +-
src/menu_sections.c | 2 +-
src/menu_sections.h | 2 +-
src/meteors_phase.c | 2 +-
src/meteors_phase.h | 2 +-
src/movie.c | 2 +-
src/movie.h | 2 +-
src/options_panel.c | 2 +-
src/options_panel.h | 2 +-
src/powermanga.c | 2 +-
src/powermanga.h | 8 +-
src/satellite_protections.c | 2 +-
src/satellite_protections.h | 2 +-
src/script_page.c | 2 +-
src/script_page.h | 2 +-
src/scrolltext.c | 2 +-
src/scrolltext.h | 2 +-
src/sdl_mixer.c | 2 +-
src/shockwave.c | 2 +-
src/shockwave.h | 2 +-
src/shots.c | 2 +-
src/shots.h | 2 +-
src/spaceship.c | 2 +-
src/spaceship.h | 2 +-
src/spaceship_weapons.c | 2 +-
src/spaceship_weapons.h | 2 +-
src/special_keys.c | 2 +-
src/sprites_string.c | 2 +-
src/sprites_string.h | 2 +-
src/starfield.c | 2 +-
src/starfield.h | 2 +-
src/text_overlay.c | 4 +-
src/text_overlay.h | 2 +-
src/texts.c | 2 +-
src/texts.h | 2 +-
src/tools.c | 2 +-
src/tools.h | 2 +-
texts/about_en.txt | 2 +-
texts/about_fr.txt | 2 +-
texts/about_it.txt | 2 +-
texts/scroll_en.txt | 2 +-
texts/scroll_fr.txt | 2 +-
texts/scroll_it.txt | 2 +-
256 files changed, 373 insertions(+), 372 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/powermanga.git
More information about the Pkg-games-commits
mailing list