Merge fixes from branch v0612maps.

diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index 58e40de158b8bdcd92e58923203d60fd4f2934d4..7e394f8631ccc4be72cfb5438420d914b4cf2b9b 100644 (file)
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -180,7 +180,7 @@
  <namedarea id="loneford" name="Loneford" type="settlement"/>
  <namedarea id="flagstone" name="Flagstone Prison" type="other"/>
  <namedarea id="fallhaven" name="Fallhaven" type="settlement"/>
- <namedarea id="fflask" name="Fomaing Flask Tavern" type="other"/>
+ <namedarea id="fflask" name="Foaming Flask Tavern" type="other"/>
  <namedarea id="crossroads" name="Crossroads Guardhouse" type="other"/>
  <namedarea id="remgard" name="Remgard" type="settlement"/>
  <namedarea id="vilegard" name="Vilegard" type="settlement"/>