~widelands-dev/widelands/localizeable_shipnames
Viewing all changes in revision 8301.
-
Committer:
GunChleoc
-
Date:
2017-04-22 08:40:21 UTC
-
mfrom:
(8298.1.40 trunk)
-
Revision ID:
fios@foramnagaidhlig.net-20170422084021-4u3vp59d9jkdfx63
Merged trunk.
-
debian/widelands.desktop.stub
=>
debian/org.widelands.widelands.desktop.stub
-
src/graphic/text/test/data/sub_autowidth_floatleftimg/
=>
src/graphic/text/test/data/div_autowidth_floatleftimg/
-
src/graphic/text/test/data/sub_background_img/
=>
src/graphic/text/test/data/div_background_img/
-
src/graphic/text/test/data/sub_fixedwidth_floatbothsides/
=>
src/graphic/text/test/data/div_fixedwidth_floatbothsides/
-
src/graphic/text/test/data/sub_fixedwidth_floatleft/
=>
src/graphic/text/test/data/div_fixedwidth_floatleft/
-
src/graphic/text/test/data/sub_fixedwidth_floatleftimg/
=>
src/graphic/text/test/data/div_fixedwidth_floatleftimg/
-
src/graphic/text/test/data/sub_fixedwidth_floatright/
=>
src/graphic/text/test/data/div_fixedwidth_floatright/
-
src/graphic/text/test/data/sub_margin_bgclr/
=>
src/graphic/text/test/data/div_margin_bgclr/
-
src/graphic/text/test/data/sub_margin_bgimg/
=>
src/graphic/text/test/data/div_margin_bgimg/
-
src/graphic/text/test/data/sub_nonfloating_valign/
=>
src/graphic/text/test/data/div_nonfloating_valign/
-
src/graphic/text/test/data/sub_padding/
=>
src/graphic/text/test/data/div_padding/
expand all
collapse all
Show diffs side-by-side
added
removed