diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-05-10 15:51:14 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-05-10 15:51:14 +0200 |
| commit | 598f79c6dd78be5c0ca684c19172f3b9d3420a44 (patch) | |
| tree | d5727018585de90709da7d4e22bc6d6199a48ce1 /example | |
| parent | ed8fba0a47d2e498267cbfbf1271bacb76c400e9 (diff) | |
| parent | 000dcd8064d60f9f34077ca0a1731af4b8773b52 (diff) | |
| download | manaserv-lpc2012.tar.gz manaserv-lpc2012.tar.bz2 manaserv-lpc2012.tar.xz manaserv-lpc2012.zip | |
Merge branch 'master' into lpc2012lpc2012
Diffstat (limited to 'example')
| -rw-r--r-- | example/settings.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/example/settings.xml b/example/settings.xml index ebe7a717..c2ba755d 100644 --- a/example/settings.xml +++ b/example/settings.xml @@ -6,6 +6,9 @@ <include file="equip.xml" /> <include file="items.xml" /> <include file="monsters.xml" /> + <include file="npcs.xml" /> <include file="emotes.xml" /> <include file="status-effects.xml" /> -</settings>
\ No newline at end of file + <include file="hair.xml" /> + <include file="units.xml" /> +</settings> |