summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-18 16:40:25 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-18 16:40:25 +0000
commit03b2efa5973db10c3e6366aa0bd2990eee60d8b9 (patch)
treeccbf7e1b89aeef4828b57c5f1d9b96d5b85e1aea
parent00f7d56663c4e77ca0c3093afb995a3f00563a76 (diff)
downloadmana-03b2efa5973db10c3e6366aa0bd2990eee60d8b9.tar.gz
mana-03b2efa5973db10c3e6366aa0bd2990eee60d8b9.tar.bz2
mana-03b2efa5973db10c3e6366aa0bd2990eee60d8b9.tar.xz
mana-03b2efa5973db10c3e6366aa0bd2990eee60d8b9.zip
Merged server item data.
-rw-r--r--ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ad667db1..e7c46186 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
* src/gui/truetypefont.cpp: Fixed double-free of true-type resources.
* src/monster.cpp: Removed compatibility hack.
* data/monsters.xml: Merged client and server monster data.
+ * data/items.xml: Merged server item data. Removed obsolete fields.
2007-10-15 Bjørn Lindeijer <bjorn@lindeijer.nl>