[Commits] [wesnoth/wesnoth] 14b428: fixup OS X compilation (for BFS-disabled) by reapp...
GitHub
noreply at github.com
Sun Nov 9 23:42:05 UTC 2014
Branch: refs/heads/1.12
Home: https://github.com/wesnoth/wesnoth
Commit: 14b4286bea8e9f8a5b455371586f764eae911347
https://github.com/wesnoth/wesnoth/commit/14b4286bea8e9f8a5b455371586f764eae911347
Author: Chris Beck <render787 at gmail.com>
Date: 2014-11-09 (Sun, 09 Nov 2014)
Changed paths:
M src/gettext.cpp
Log Message:
-----------
fixup OS X compilation (for BFS-disabled) by reapply bugfix #16694
See irclogs
http://www.wesnoth.org/irclogs/2014/11/%23wesnoth-dev.2014-11-08.log
Conflicts:
src/gettext.cpp
Commit: 505fa4681f87a9afa43d4d31bbc17a26b0005fd3
https://github.com/wesnoth/wesnoth/commit/505fa4681f87a9afa43d4d31bbc17a26b0005fd3
Author: Chris Beck <render787 at gmail.com>
Date: 2014-11-09 (Sun, 09 Nov 2014)
Changed paths:
M Doxyfile
M INSTALL
M RELEASE_NOTES
M changelog
M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
M data/core/images/themes/classic/minimap.png
M doc/man/gl/wesnoth.6
M doc/man/it/wesnoth.6
M doc/man/it/wesnothd.6
M doc/man/pt/wesnoth.6
M doc/man/pt/wesnothd.6
M doc/manual/manual.cs.html
M doc/manual/manual.de.html
M doc/manual/manual.en.html
M doc/manual/manual.en_GB.html
M doc/manual/manual.es.html
M doc/manual/manual.et.html
M doc/manual/manual.fi.html
M doc/manual/manual.fr.html
M doc/manual/manual.gl.html
M doc/manual/manual.hu.html
M doc/manual/manual.id.html
M doc/manual/manual.it.html
M doc/manual/manual.ja.html
M doc/manual/manual.pl.html
M doc/manual/manual.pt.html
M doc/manual/manual.pt_BR.html
M doc/manual/manual.ru.html
M doc/manual/manual.sk.html
M doc/manual/manual.sr.html
M doc/manual/manual.sr at ijekavian.html
M doc/manual/manual.sr at ijekavianlatin.html
M doc/manual/manual.sr at latin.html
M doc/manual/manual.uk.html
M doc/manual/manual.vi.html
M doc/manual/manual.zh_CN.html
M doc/manual/manual.zh_TW.html
M players_changelog
M po/wesnoth-ai/cs.po
M po/wesnoth-ai/wesnoth-ai.pot
M po/wesnoth-anl/wesnoth-anl.pot
M po/wesnoth-aoi/wesnoth-aoi.pot
M po/wesnoth-did/wesnoth-did.pot
M po/wesnoth-dm/wesnoth-dm.pot
M po/wesnoth-dw/wesnoth-dw.pot
M po/wesnoth-editor/af.po
M po/wesnoth-editor/ang.po
M po/wesnoth-editor/ang at latin.po
M po/wesnoth-editor/ar.po
M po/wesnoth-editor/bg.po
M po/wesnoth-editor/ca.po
M po/wesnoth-editor/ca_ES at valencia.po
M po/wesnoth-editor/cs.po
M po/wesnoth-editor/da.po
M po/wesnoth-editor/de.po
M po/wesnoth-editor/el.po
M po/wesnoth-editor/en at shaw.po
M po/wesnoth-editor/en_GB.po
M po/wesnoth-editor/eo.po
M po/wesnoth-editor/es.po
M po/wesnoth-editor/et.po
M po/wesnoth-editor/eu.po
M po/wesnoth-editor/fi.po
M po/wesnoth-editor/fr.po
M po/wesnoth-editor/fur_IT.po
M po/wesnoth-editor/ga.po
M po/wesnoth-editor/gd.po
M po/wesnoth-editor/gl.po
M po/wesnoth-editor/he.po
M po/wesnoth-editor/hr.po
M po/wesnoth-editor/hu.po
M po/wesnoth-editor/id.po
M po/wesnoth-editor/is.po
M po/wesnoth-editor/it.po
M po/wesnoth-editor/ja.po
M po/wesnoth-editor/ko.po
M po/wesnoth-editor/la.po
M po/wesnoth-editor/lt.po
M po/wesnoth-editor/lv.po
M po/wesnoth-editor/mk.po
M po/wesnoth-editor/mr.po
M po/wesnoth-editor/nb_NO.po
M po/wesnoth-editor/nl.po
M po/wesnoth-editor/pl.po
M po/wesnoth-editor/pt.po
M po/wesnoth-editor/pt_BR.po
M po/wesnoth-editor/racv.po
M po/wesnoth-editor/ro.po
M po/wesnoth-editor/ru.po
M po/wesnoth-editor/sk.po
M po/wesnoth-editor/sl.po
M po/wesnoth-editor/sr.po
M po/wesnoth-editor/sr at ijekavian.po
M po/wesnoth-editor/sr at ijekavianlatin.po
M po/wesnoth-editor/sr at latin.po
M po/wesnoth-editor/sv.po
M po/wesnoth-editor/tl.po
M po/wesnoth-editor/tr.po
M po/wesnoth-editor/uk.po
M po/wesnoth-editor/vi.po
M po/wesnoth-editor/wesnoth-editor.pot
M po/wesnoth-editor/zh_CN.po
M po/wesnoth-editor/zh_TW.po
M po/wesnoth-ei/de.po
M po/wesnoth-ei/wesnoth-ei.pot
M po/wesnoth-help/wesnoth-help.pot
M po/wesnoth-httt/wesnoth-httt.pot
M po/wesnoth-l/wesnoth-l.pot
M po/wesnoth-lib/af.po
M po/wesnoth-lib/ang.po
M po/wesnoth-lib/ang at latin.po
M po/wesnoth-lib/ar.po
M po/wesnoth-lib/bg.po
M po/wesnoth-lib/ca.po
M po/wesnoth-lib/ca_ES at valencia.po
M po/wesnoth-lib/cs.po
M po/wesnoth-lib/da.po
M po/wesnoth-lib/de.po
M po/wesnoth-lib/el.po
M po/wesnoth-lib/en at shaw.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-lib/eo.po
M po/wesnoth-lib/es.po
M po/wesnoth-lib/et.po
M po/wesnoth-lib/eu.po
M po/wesnoth-lib/fi.po
M po/wesnoth-lib/fr.po
M po/wesnoth-lib/fur_IT.po
M po/wesnoth-lib/ga.po
M po/wesnoth-lib/gd.po
M po/wesnoth-lib/gl.po
M po/wesnoth-lib/he.po
M po/wesnoth-lib/hr.po
M po/wesnoth-lib/hu.po
M po/wesnoth-lib/id.po
M po/wesnoth-lib/is.po
M po/wesnoth-lib/it.po
M po/wesnoth-lib/ja.po
M po/wesnoth-lib/ko.po
M po/wesnoth-lib/la.po
M po/wesnoth-lib/lt.po
M po/wesnoth-lib/lv.po
M po/wesnoth-lib/mk.po
M po/wesnoth-lib/mr.po
M po/wesnoth-lib/nb_NO.po
M po/wesnoth-lib/nl.po
M po/wesnoth-lib/pl.po
M po/wesnoth-lib/pt.po
M po/wesnoth-lib/pt_BR.po
M po/wesnoth-lib/racv.po
M po/wesnoth-lib/ro.po
M po/wesnoth-lib/ru.po
M po/wesnoth-lib/sk.po
M po/wesnoth-lib/sl.po
M po/wesnoth-lib/sr.po
M po/wesnoth-lib/sr at ijekavian.po
M po/wesnoth-lib/sr at ijekavianlatin.po
M po/wesnoth-lib/sr at latin.po
M po/wesnoth-lib/sv.po
M po/wesnoth-lib/tl.po
M po/wesnoth-lib/tr.po
M po/wesnoth-lib/uk.po
M po/wesnoth-lib/vi.po
M po/wesnoth-lib/wesnoth-lib.pot
M po/wesnoth-lib/zh_CN.po
M po/wesnoth-lib/zh_TW.po
M po/wesnoth-low/af.po
M po/wesnoth-low/ang.po
M po/wesnoth-low/ang at latin.po
M po/wesnoth-low/ar.po
M po/wesnoth-low/bg.po
M po/wesnoth-low/ca.po
M po/wesnoth-low/ca_ES at valencia.po
M po/wesnoth-low/cs.po
M po/wesnoth-low/da.po
M po/wesnoth-low/de.po
M po/wesnoth-low/el.po
M po/wesnoth-low/en at shaw.po
M po/wesnoth-low/en_GB.po
M po/wesnoth-low/eo.po
M po/wesnoth-low/es.po
M po/wesnoth-low/et.po
M po/wesnoth-low/eu.po
M po/wesnoth-low/fi.po
M po/wesnoth-low/fr.po
M po/wesnoth-low/fur_IT.po
M po/wesnoth-low/ga.po
M po/wesnoth-low/gd.po
M po/wesnoth-low/gl.po
M po/wesnoth-low/he.po
M po/wesnoth-low/hr.po
M po/wesnoth-low/hu.po
M po/wesnoth-low/id.po
M po/wesnoth-low/is.po
M po/wesnoth-low/it.po
M po/wesnoth-low/ja.po
M po/wesnoth-low/ko.po
M po/wesnoth-low/la.po
M po/wesnoth-low/lt.po
M po/wesnoth-low/lv.po
M po/wesnoth-low/mk.po
M po/wesnoth-low/mr.po
M po/wesnoth-low/nb_NO.po
M po/wesnoth-low/nl.po
M po/wesnoth-low/pl.po
M po/wesnoth-low/pt.po
M po/wesnoth-low/pt_BR.po
M po/wesnoth-low/racv.po
M po/wesnoth-low/ro.po
M po/wesnoth-low/ru.po
M po/wesnoth-low/sk.po
M po/wesnoth-low/sl.po
M po/wesnoth-low/sr.po
M po/wesnoth-low/sr at ijekavian.po
M po/wesnoth-low/sr at ijekavianlatin.po
M po/wesnoth-low/sr at latin.po
M po/wesnoth-low/sv.po
M po/wesnoth-low/tl.po
M po/wesnoth-low/tr.po
M po/wesnoth-low/uk.po
M po/wesnoth-low/vi.po
M po/wesnoth-low/wesnoth-low.pot
M po/wesnoth-low/zh_CN.po
M po/wesnoth-low/zh_TW.po
M po/wesnoth-manual/wesnoth-manual.pot
M po/wesnoth-multiplayer/cs.po
M po/wesnoth-multiplayer/de.po
M po/wesnoth-multiplayer/wesnoth-multiplayer.pot
M po/wesnoth-nr/wesnoth-nr.pot
M po/wesnoth-sof/wesnoth-sof.pot
M po/wesnoth-sotbe/wesnoth-sotbe.pot
M po/wesnoth-tb/wesnoth-tb.pot
M po/wesnoth-test/wesnoth-test.pot
M po/wesnoth-thot/wesnoth-thot.pot
M po/wesnoth-trow/de.po
M po/wesnoth-trow/wesnoth-trow.pot
M po/wesnoth-tsg/wesnoth-tsg.pot
M po/wesnoth-tutorial/wesnoth-tutorial.pot
M po/wesnoth-units/wesnoth-units.pot
M po/wesnoth-utbs/de.po
M po/wesnoth-utbs/wesnoth-utbs.pot
M po/wesnoth/POTFILES.in
M po/wesnoth/af.po
M po/wesnoth/ang.po
M po/wesnoth/ang at latin.po
M po/wesnoth/ar.po
M po/wesnoth/bg.po
M po/wesnoth/ca.po
M po/wesnoth/ca_ES at valencia.po
M po/wesnoth/cs.po
M po/wesnoth/da.po
M po/wesnoth/de.po
M po/wesnoth/el.po
M po/wesnoth/en at shaw.po
M po/wesnoth/en_GB.po
M po/wesnoth/eo.po
M po/wesnoth/es.po
M po/wesnoth/et.po
M po/wesnoth/eu.po
M po/wesnoth/fi.po
M po/wesnoth/fr.po
M po/wesnoth/fur_IT.po
M po/wesnoth/ga.po
M po/wesnoth/gd.po
M po/wesnoth/gl.po
M po/wesnoth/he.po
M po/wesnoth/hr.po
M po/wesnoth/hu.po
M po/wesnoth/id.po
M po/wesnoth/is.po
M po/wesnoth/it.po
M po/wesnoth/ja.po
M po/wesnoth/ko.po
M po/wesnoth/la.po
M po/wesnoth/lt.po
M po/wesnoth/lv.po
M po/wesnoth/mk.po
M po/wesnoth/mr.po
M po/wesnoth/nb_NO.po
M po/wesnoth/nl.po
M po/wesnoth/pl.po
M po/wesnoth/pt.po
M po/wesnoth/pt_BR.po
M po/wesnoth/racv.po
M po/wesnoth/ro.po
M po/wesnoth/ru.po
M po/wesnoth/sk.po
M po/wesnoth/sl.po
M po/wesnoth/sr.po
M po/wesnoth/sr at ijekavian.po
M po/wesnoth/sr at ijekavianlatin.po
M po/wesnoth/sr at latin.po
M po/wesnoth/sv.po
M po/wesnoth/tl.po
M po/wesnoth/tr.po
M po/wesnoth/uk.po
M po/wesnoth/vi.po
M po/wesnoth/wesnoth.pot
M po/wesnoth/zh_CN.po
M po/wesnoth/zh_TW.po
M projectfiles/Xcode/Info.plist
M projectfiles/Xcode/Resources/SDLMain.nib/designable.nib
M projectfiles/Xcode/Resources/SDLMain.nib/keyedobjects.nib
M src/display.cpp
M src/filesystem_boost.cpp
M src/gettext_boost.cpp
M src/server/server.cpp
M src/wesconfig.h
Log Message:
-----------
Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12
Compare: https://github.com/wesnoth/wesnoth/compare/83caa8d48b1f...505fa4681f87
More information about the Commits
mailing list