[freeciv] 03/05: Merge tag 'upstream/2.5.3'
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Feb 7 16:26:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository freeciv.
commit c12a6b13f391b9dca9c3b53c5f1b0768c99d9042
Merge: 455db4f 86b1bb7
Author: Markus Koschany <apo at debian.org>
Date: Sun Feb 7 17:04:08 2016 +0100
Merge tag 'upstream/2.5.3'
Upstream version 2.5.3
# gpg: Signature made Sun 07 Feb 2016 17:03:32 CET 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 | 232 +
Makefile.am | 2 +-
Makefile.in | 9 +-
NEWS-2.5 | 35 +-
aclocal.m4 | 2 +-
ai/Makefile.in | 7 +-
ai/classic/Makefile.in | 7 +-
ai/default/Makefile.in | 7 +-
ai/stub/Makefile.in | 7 +-
ai/threaded/Makefile.in | 7 +-
client/Makefile.in | 7 +-
client/agents/Makefile.in | 7 +-
client/cityrepdata.c | 4 +-
client/gui-gtk-2.0/Makefile.in | 7 +-
client/gui-gtk-3.0/Makefile.in | 7 +-
client/gui-qt/Makefile.in | 7 +-
client/gui-qt/citydlg.cpp | 8 +-
client/gui-qt/fc_client.cpp | 7 +-
client/gui-qt/menu.cpp | 23 +-
client/gui-qt/plrdlg.cpp | 16 +-
client/gui-qt/ratesdlg.cpp | 6 +-
client/gui-sdl/Makefile.in | 7 +-
client/gui-stub/Makefile.in | 7 +-
client/gui-xaw/Freeciv.h | 2 +-
client/gui-xaw/Makefile.in | 7 +-
client/include/Makefile.in | 7 +-
client/luascript/Makefile.in | 7 +-
client/luascript/tolua_client_gen.h | 2 +-
common/Makefile.in | 7 +-
common/aicore/Makefile.in | 7 +-
common/scriptcore/Makefile.in | 7 +-
common/scriptcore/tolua_common_a_gen.h | 2 +-
common/scriptcore/tolua_common_z_gen.h | 2 +-
common/scriptcore/tolua_game_gen.c | 22 +-
common/scriptcore/tolua_game_gen.h | 2 +-
common/scriptcore/tolua_signal_gen.h | 2 +-
common/version.c | 2 +-
configure | 60 +-
configure.ac | 10 +-
data/Freeciv | 2 +-
data/Makefile.in | 9 +-
data/amplio2/Makefile.in | 7 +-
data/buildings/Makefile.in | 7 +-
data/cimpletoon/Makefile.in | 7 +-
data/civ1/Makefile.in | 7 +-
data/civ2/Makefile.in | 7 +-
data/civ2civ3/Makefile.in | 7 +-
data/classic/Makefile.in | 7 +-
data/default/Makefile.in | 7 +-
data/experimental/Makefile.in | 7 +-
data/flags/Makefile.in | 7 +-
data/flags/saxony-large.png | Bin 1683 -> 1607 bytes
data/flags/saxony-shield-large.png | Bin 864 -> 977 bytes
data/flags/saxony-shield.png | Bin 557 -> 697 bytes
data/flags/saxony.png | Bin 1122 -> 1063 bytes
data/flags/saxony.svg | 2308 +--
data/flags/sikkim-large.png | Bin 1439 -> 1372 bytes
data/flags/sikkim-shield-large.png | Bin 823 -> 741 bytes
data/flags/sikkim-shield.png | Bin 545 -> 561 bytes
data/flags/sikkim.png | Bin 963 -> 933 bytes
data/flags/sikkim.svg | 17 -
data/hex2t/Makefile.in | 7 +-
data/icons/Makefile.in | 7 +-
data/isophex/Makefile.in | 7 +-
data/isotrident/Makefile.in | 7 +-
data/misc/Makefile.in | 7 +-
data/multiplayer/Makefile.in | 7 +-
data/nation/Makefile.in | 7 +-
data/scenarios/Makefile.in | 7 +-
data/stdsounds/Makefile.in | 7 +-
data/themes/Makefile.in | 7 +-
data/themes/gui-gtk-2.0/Freeciv/Makefile.in | 7 +-
.../gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/Buttons/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/Check-Radio/Makefile.in | 7 +-
.../gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/Frame-Gap/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/Handles/Makefile.in | 7 +-
.../gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/ListHeaders/Makefile.in | 7 +-
.../themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/Menu-Menubar/Makefile.in | 7 +-
.../gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in | 7 +-
.../gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/ProgressBar/Makefile.in | 7 +-
.../gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/Scrollbars/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/Shadows/Makefile.in | 7 +-
.../gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in | 7 +-
.../gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in | 7 +-
.../Freeciv/gtk-2.0/Toolbar/Makefile.in | 7 +-
data/themes/gui-gtk-2.0/Makefile.in | 7 +-
data/themes/gui-gtk-3.0/Freeciv/Makefile.in | 7 +-
.../gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/Buttons/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/Check-Radio/Makefile.in | 7 +-
.../gui-gtk-3.0/Freeciv/gtk-3.0/Combo/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/Frame-Gap/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/Handles/Makefile.in | 7 +-
.../gui-gtk-3.0/Freeciv/gtk-3.0/Lines/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/ListHeaders/Makefile.in | 7 +-
.../themes/gui-gtk-3.0/Freeciv/gtk-3.0/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/Menu-Menubar/Makefile.in | 7 +-
.../gui-gtk-3.0/Freeciv/gtk-3.0/Others/Makefile.in | 7 +-
.../gui-gtk-3.0/Freeciv/gtk-3.0/Panel/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/ProgressBar/Makefile.in | 7 +-
.../gui-gtk-3.0/Freeciv/gtk-3.0/Range/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/Scrollbars/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/Shadows/Makefile.in | 7 +-
.../gui-gtk-3.0/Freeciv/gtk-3.0/Spin/Makefile.in | 7 +-
.../gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/Makefile.in | 7 +-
.../Freeciv/gtk-3.0/Toolbar/Makefile.in | 7 +-
data/themes/gui-gtk-3.0/Makefile.in | 7 +-
data/themes/gui-qt/Makefile.in | 7 +-
data/themes/gui-qt/icons/Makefile.in | 7 +-
data/themes/gui-sdl/Makefile.in | 7 +-
data/themes/gui-sdl/human/Makefile.in | 7 +-
data/trident/Makefile.in | 7 +-
data/wonders/Makefile.in | 7 +-
dependencies/Makefile.in | 7 +-
dependencies/cvercmp/Makefile.in | 7 +-
dependencies/lua-5.2/Makefile.in | 7 +-
dependencies/lua-5.2/src/Makefile.in | 7 +-
dependencies/luasql/Makefile.in | 7 +-
dependencies/luasql/src/Makefile.in | 7 +-
dependencies/tolua-5.2/Makefile.in | 7 +-
dependencies/tolua-5.2/src/Makefile.in | 7 +-
dependencies/tolua-5.2/src/bin/Makefile.in | 7 +-
dependencies/tolua-5.2/src/lib/Makefile.in | 7 +-
doc/Makefile.in | 7 +-
doc/ca/Makefile.in | 7 +-
doc/de/Makefile.in | 7 +-
doc/fr/Makefile.in | 7 +-
doc/it/Makefile.in | 7 +-
doc/ja/Makefile.in | 7 +-
doc/man/Makefile.in | 7 +-
doc/nl/Makefile.in | 7 +-
doc/sv/Makefile.in | 7 +-
fc_version | 2 +-
m4/{glib-gettext.m4 => freeciv-gettext.m4} | 85 +-
m4/readline.m4 | 2 +-
server/Makefile.in | 7 +-
server/advisors/Makefile.in | 7 +-
server/console.h | 3 +-
server/generator/Makefile.in | 7 +-
server/scripting/Makefile.in | 7 +-
server/scripting/tolua_fcdb_gen.h | 2 +-
server/scripting/tolua_server_gen.c | 8 +-
server/scripting/tolua_server_gen.h | 2 +-
server/settings.c | 2 +-
tests/Makefile.in | 7 +-
tools/Makefile.in | 7 +-
translations/Makefile.in | 7 +-
translations/freeciv/ar.gmo | Bin 190318 -> 190318 bytes
translations/freeciv/ar.po | 60 +-
translations/freeciv/bg.gmo | Bin 119916 -> 119916 bytes
translations/freeciv/bg.po | 60 +-
translations/freeciv/ca.gmo | Bin 1016954 -> 1016954 bytes
translations/freeciv/ca.po | 60 +-
translations/freeciv/cs.gmo | Bin 216311 -> 216311 bytes
translations/freeciv/cs.po | 60 +-
translations/freeciv/da.gmo | Bin 575798 -> 575798 bytes
translations/freeciv/da.po | 60 +-
translations/freeciv/de.gmo | Bin 1020418 -> 1020418 bytes
translations/freeciv/de.po | 60 +-
translations/freeciv/el.gmo | Bin 253791 -> 253791 bytes
translations/freeciv/el.po | 60 +-
translations/freeciv/en_GB.gmo | Bin 955737 -> 955737 bytes
translations/freeciv/en_GB.po | 60 +-
translations/freeciv/eo.gmo | Bin 178311 -> 178311 bytes
translations/freeciv/eo.po | 60 +-
translations/freeciv/es.gmo | Bin 1032518 -> 1032518 bytes
translations/freeciv/es.po | 60 +-
translations/freeciv/et.gmo | Bin 230960 -> 230960 bytes
translations/freeciv/et.po | 60 +-
translations/freeciv/fa.gmo | Bin 96177 -> 96177 bytes
translations/freeciv/fa.po | 60 +-
translations/freeciv/fi.gmo | Bin 1008555 -> 1008537 bytes
translations/freeciv/fi.po | 80 +-
translations/freeciv/fr.gmo | Bin 1044663 -> 1044663 bytes
translations/freeciv/fr.po | 60 +-
translations/freeciv/freeciv.pot | 60 +-
translations/freeciv/ga.gmo | Bin 211246 -> 211246 bytes
translations/freeciv/ga.po | 60 +-
translations/freeciv/gd.gmo | Bin 809615 -> 809615 bytes
translations/freeciv/gd.po | 60 +-
translations/freeciv/he.gmo | Bin 97796 -> 97796 bytes
translations/freeciv/he.po | 60 +-
translations/freeciv/hu.gmo | Bin 142936 -> 142936 bytes
translations/freeciv/hu.po | 60 +-
translations/freeciv/id.gmo | Bin 217456 -> 217456 bytes
translations/freeciv/id.po | 60 +-
translations/freeciv/it.gmo | Bin 482217 -> 482217 bytes
translations/freeciv/it.po | 62 +-
translations/freeciv/ja.gmo | Bin 1003347 -> 1003347 bytes
translations/freeciv/ja.po | 60 +-
translations/freeciv/ko.gmo | Bin 435524 -> 435524 bytes
translations/freeciv/ko.po | 60 +-
translations/freeciv/lt.gmo | Bin 177647 -> 177647 bytes
translations/freeciv/lt.po | 60 +-
translations/freeciv/nb.gmo | Bin 196081 -> 196081 bytes
translations/freeciv/nb.po | 60 +-
translations/freeciv/nl.gmo | Bin 408645 -> 408645 bytes
translations/freeciv/nl.po | 60 +-
translations/freeciv/pl.gmo | Bin 917140 -> 917140 bytes
translations/freeciv/pl.po | 60 +-
translations/freeciv/pt.gmo | Bin 131169 -> 131169 bytes
translations/freeciv/pt.po | 60 +-
translations/freeciv/pt_BR.gmo | Bin 436960 -> 436960 bytes
translations/freeciv/pt_BR.po | 60 +-
translations/freeciv/ro.gmo | Bin 199364 -> 199364 bytes
translations/freeciv/ro.po | 60 +-
translations/freeciv/ru.gmo | Bin 1387272 -> 1390374 bytes
translations/freeciv/ru.po | 19331 ++++++++++++++++++-
translations/freeciv/sr.gmo | Bin 145448 -> 145448 bytes
translations/freeciv/sr.po | 60 +-
translations/freeciv/sv.gmo | Bin 299234 -> 299234 bytes
translations/freeciv/sv.po | 60 +-
translations/freeciv/tr.gmo | Bin 230087 -> 230087 bytes
translations/freeciv/tr.po | 60 +-
translations/freeciv/uk.gmo | Bin 516176 -> 516176 bytes
translations/freeciv/uk.po | 60 +-
translations/freeciv/zh_CN.gmo | Bin 165709 -> 165709 bytes
translations/freeciv/zh_CN.po | 60 +-
translations/freeciv/zh_TW.gmo | Bin 99138 -> 99138 bytes
translations/freeciv/zh_TW.po | 60 +-
translations/nations/ar.gmo | Bin 8111 -> 8111 bytes
translations/nations/ar.po | 2 +-
translations/nations/bg.gmo | Bin 25942 -> 25942 bytes
translations/nations/bg.po | 2 +-
translations/nations/ca.gmo | Bin 439462 -> 439462 bytes
translations/nations/ca.po | 2 +-
translations/nations/cs.gmo | Bin 14232 -> 14232 bytes
translations/nations/cs.po | 2 +-
translations/nations/da.gmo | Bin 136522 -> 136522 bytes
translations/nations/da.po | 2 +-
translations/nations/de.gmo | Bin 236328 -> 236328 bytes
translations/nations/de.po | 2 +-
translations/nations/el.gmo | Bin 16120 -> 16120 bytes
translations/nations/el.po | 2 +-
translations/nations/en_GB.gmo | Bin 430139 -> 430139 bytes
translations/nations/en_GB.po | 2 +-
translations/nations/eo.gmo | Bin 15192 -> 15192 bytes
translations/nations/eo.po | 2 +-
translations/nations/es.gmo | Bin 442542 -> 442542 bytes
translations/nations/es.po | 2 +-
translations/nations/et.gmo | Bin 22087 -> 22087 bytes
translations/nations/et.po | 2 +-
translations/nations/fa.gmo | Bin 9777 -> 9777 bytes
translations/nations/fa.po | 2 +-
translations/nations/fi.gmo | Bin 275709 -> 275709 bytes
translations/nations/fi.po | 2 +-
translations/nations/fr.gmo | Bin 449518 -> 449518 bytes
translations/nations/fr.po | 2 +-
translations/nations/freeciv-nations.pot | 2 +-
translations/nations/ga.gmo | Bin 57007 -> 57007 bytes
translations/nations/ga.po | 2 +-
translations/nations/gd.gmo | Bin 332115 -> 332115 bytes
translations/nations/gd.po | 2 +-
translations/nations/he.gmo | Bin 8205 -> 8205 bytes
translations/nations/he.po | 2 +-
translations/nations/hu.gmo | Bin 5157 -> 5157 bytes
translations/nations/hu.po | 2 +-
translations/nations/id.gmo | Bin 93658 -> 93658 bytes
translations/nations/id.po | 2 +-
translations/nations/it.gmo | Bin 53499 -> 53499 bytes
translations/nations/it.po | 2 +-
translations/nations/ja.gmo | Bin 411935 -> 411935 bytes
translations/nations/ja.po | 2 +-
translations/nations/ko.gmo | Bin 25039 -> 25039 bytes
translations/nations/ko.po | 2 +-
translations/nations/lt.gmo | Bin 24758 -> 24758 bytes
translations/nations/lt.po | 2 +-
translations/nations/nb.gmo | Bin 6977 -> 6977 bytes
translations/nations/nb.po | 2 +-
translations/nations/nl.gmo | Bin 161986 -> 161986 bytes
translations/nations/nl.po | 2 +-
translations/nations/pl.gmo | Bin 441176 -> 441176 bytes
translations/nations/pl.po | 2 +-
translations/nations/pt.gmo | Bin 4748 -> 4748 bytes
translations/nations/pt.po | 2 +-
translations/nations/pt_BR.gmo | Bin 51658 -> 51658 bytes
translations/nations/pt_BR.po | 2 +-
translations/nations/ro.gmo | Bin 6160 -> 6160 bytes
translations/nations/ro.po | 2 +-
translations/nations/ru.gmo | Bin 622788 -> 622771 bytes
translations/nations/ru.po | 33 +-
translations/nations/sr.gmo | Bin 7952 -> 7952 bytes
translations/nations/sr.po | 2 +-
translations/nations/sv.gmo | Bin 32776 -> 32776 bytes
translations/nations/sv.po | 2 +-
translations/nations/tr.gmo | Bin 10677 -> 10677 bytes
translations/nations/tr.po | 2 +-
translations/nations/uk.gmo | Bin 83765 -> 83765 bytes
translations/nations/uk.po | 2 +-
translations/nations/zh_CN.gmo | Bin 12245 -> 12245 bytes
translations/nations/zh_CN.po | 2 +-
translations/nations/zh_TW.gmo | Bin 33758 -> 33758 bytes
translations/nations/zh_TW.po | 2 +-
utility/Makefile.in | 7 +-
win32/Makefile.in | 7 +-
301 files changed, 20900 insertions(+), 4408 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeciv.git
More information about the Pkg-games-commits
mailing list