From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Mon, 27 Aug 2012 17:44:53 +0000 (+0200)
Subject: Merge fixes from branch v0612maps.
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1b2bdfa4e00b286ae0eb1e480669ea8387464519;p=users%2Fmchehab%2Fandors-trail.git

Merge fixes from branch v0612maps.
---

diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index 58e40de..7e394f8 100644
--- 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"/>