Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-12-08 16:56:44 +0000
committerStijn Buys <ingar@osirion.org>2012-12-08 16:56:44 +0000
commite2d08da79fa3f173f41df59560311c3062dac6f4 (patch)
tree3dc222a0c7ea0e8e3dc4c3819390da27001deb55 /base/ini/factions.ini
parent3dd402c0f8d266ffe9fb366c068f063299c7b056 (diff)
Updated trade definitions, added racetrack to the Phoenicia system, added medicines model.
Diffstat (limited to 'base/ini/factions.ini')
-rw-r--r--base/ini/factions.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 569fcda..df93078 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -66,7 +66,7 @@ color=106 95 87
label=mercenaries
name=Mercenaries Guild
-[factiom]
+[faction]
label=merchants
name=Merchants Association