[lordsawar] 02/06: Merge tag 'upstream/0.3.1'
Markus Koschany
apo at moszumanska.debian.org
Mon Oct 3 15:26:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository lordsawar.
commit 8e98a33ba224984d2717efd1c816aab296735230
Merge: 6c71f3f 2d91185
Author: Markus Koschany <apo at debian.org>
Date: Mon Oct 3 16:17:00 2016 +0200
Merge tag 'upstream/0.3.1'
Upstream version 0.3.1
# gpg: Signatur vom Mo 03 Okt 2016 16:16:58 CEST
# gpg: mittels RSA-Schlüssel D9AD14B9513B51E4
# gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
# gpg: alias "Markus Koschany <markus at koschany.net>" [ultimativ]
# gpg: alias "Markus Koschany <apo at debian.org>" [ultimativ]
ABOUT-NLS | 1282 ++++++
INSTALL | 4 +-
Makefile.in | 55 +-
aclocal.m4 | 635 ++-
compile | 347 ++
config.guess | 15 +-
config.h.in | 3 +-
config.rpath | 690 +++
config.sub | 19 +-
configure | 3275 +++++++++------
configure.ac | 4 +-
create-lw-file | 7 +-
dat/Makefile.in | 34 +-
dat/army/Makefile.in | 30 +-
dat/army/bigdefault/Makefile.in | 30 +-
dat/army/default/Makefile.in | 30 +-
dat/army/duel/Makefile.in | 30 +-
dat/citysets/Makefile.in | 30 +-
dat/citysets/bigdefault/Makefile.in | 30 +-
dat/citysets/bigdol/Makefile.in | 30 +-
dat/citysets/default/Makefile.in | 30 +-
dat/citysets/dol/Makefile.in | 30 +-
dat/glade/Makefile.in | 30 +-
dat/glade/editor/Makefile.in | 30 +-
dat/icons/32x32/Makefile.in | 30 +-
dat/icons/64x64/Makefile.in | 30 +-
dat/icons/Makefile.in | 30 +-
dat/map/Makefile.in | 30 +-
dat/map/dol/Makefile.in | 30 +-
dat/map/duel/Makefile.in | 30 +-
dat/music/Makefile.in | 30 +-
dat/shield/Makefile.in | 30 +-
dat/shield/default/Makefile.in | 30 +-
dat/shield/dol/Makefile.in | 30 +-
dat/shield/plain/Makefile.in | 30 +-
dat/tilesets/Makefile.in | 30 +-
dat/tilesets/bigdefault/Makefile.in | 30 +-
dat/tilesets/bigstark/Makefile.in | 30 +-
dat/tilesets/bigwesnoth/Makefile.in | 30 +-
dat/tilesets/default/Makefile.in | 30 +-
dat/tilesets/stark/Makefile.in | 30 +-
dat/tilesets/wesnoth/Makefile.in | 30 +-
dat/various/Makefile.in | 30 +-
dat/various/editor/Makefile.in | 30 +-
dat/various/items/Makefile.in | 30 +-
dat/various/xslt/Makefile.in | 30 +-
depcomp | 2 +-
doc/Makefile.in | 30 +-
help/Makefile.in | 30 +-
help/figures/Makefile.in | 30 +-
install-sh | 366 +-
ltmain.sh | 5528 ++++++++++++++++---------
m4/intltool.m4 | 237 ++
m4/libtool.m4 | 2550 +++++++-----
m4/ltoptions.m4 | 127 +-
m4/ltsugar.m4 | 7 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 7 +-
m4/nls.m4 | 32 +
missing | 6 +-
po/lordsawar.pot | 337 +-
src/GameMap.cpp | 10 +-
src/LocationBox.cpp | 2 +-
src/Makefile.in | 31 +-
src/MapGenerator.cpp | 2 +-
src/ai_fast.cpp | 586 +--
src/editor/Makefile.in | 31 +-
src/editor/smallmap-editor-dialog.cpp | 70 +-
src/editor/tileset-flag-editor-dialog.cpp | 6 +-
src/editor/tileset-selector-editor-dialog.cpp | 6 +-
src/game-server.h | 2 +-
src/game.h | 4 +-
src/ghs/Makefile.in | 31 +-
src/ghs/gamehost-server.h | 2 +-
src/gls/Makefile.in | 31 +-
src/gls/gamelist-server.h | 2 +-
src/gui/Makefile.in | 31 +-
src/gui/driver.cpp | 43 +-
src/gui/game-window.cpp | 51 +-
src/gui/main.cpp | 28 +-
src/gui/use-item-on-player-dialog.cpp | 2 +-
src/player.cpp | 2 +-
src/snd.cpp | 7 +
src/stacklist.cpp | 20 +-
src/tileset.cpp | 2 +-
85 files changed, 11657 insertions(+), 6006 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lordsawar.git
More information about the Pkg-games-commits
mailing list