[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.1.9-1-37-g98f0bab
Clint Adams
schizo at debian.org
Mon Feb 8 12:55:27 UTC 2010
The following commit has been merged in the master branch:
commit 4e4a1b0bf72abab075311574e6d373fe8550e32b
Merge: 3edee93224dad6b9b294de9c404a3f09cbadfcaf c54ee3229d728eff8d66ea1fecce7f2b4f64d8d0
Author: Clint Adams <schizo at debian.org>
Date: Mon Feb 8 07:27:58 2010 -0500
Merge commit 'upstream/2.1.11'
Conflicts:
ChangeLog
ai/aiexplorer.c
client/connectdlg_common.c
client/control.c
client/gui-gtk-2.0/messagewin.c
client/gui-xaw/Freeciv.h
client/tilespec.h
configure
data/Freeciv
po/ar.gmo
po/ar.po
po/ca.gmo
po/ca.po
po/cs.gmo
po/cs.po
po/da.gmo
po/da.po
po/de.gmo
po/de.po
po/el.gmo
po/el.po
po/en_GB.gmo
po/en_GB.po
po/eo.gmo
po/eo.po
po/es.gmo
po/es.po
po/et.gmo
po/et.po
po/fa.gmo
po/fa.po
po/fi.gmo
po/fi.po
po/fr.gmo
po/fr.po
po/freeciv.pot
po/he.gmo
po/he.po
po/hu.gmo
po/hu.po
po/it.gmo
po/it.po
po/ja.gmo
po/ja.po
po/ko.gmo
po/ko.po
po/lt.gmo
po/lt.po
po/nb.gmo
po/nb.po
po/nl.gmo
po/nl.po
po/no.gmo
po/no.po
po/pl.gmo
po/pl.po
po/pt.gmo
po/pt.po
po/pt_BR.gmo
po/pt_BR.po
po/ro.gmo
po/ro.po
po/ru.gmo
po/ru.po
po/sv.gmo
po/sv.po
po/tr.gmo
po/tr.po
po/uk.gmo
po/uk.po
po/zh_CN.gmo
po/zh_CN.po
server/plrhand.c
server/unittools.c
utility/ftwl/be_common_24.c
utility/ftwl/be_common_pixels.c
utility/shared.c
version.in
--
Civilization turn-based strategy game
More information about the Pkg-games-commits
mailing list