summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 59b78674..31895fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2008-11-06 Dennis Friis <peavey@placid.dk>
- * src/game.cpp: Do not activate shortcuts if tradewindow is visible.
+ * src/game.cpp: Do not activate shortcuts if tradewindow is visible.
+ * src/equipment.cpp: Remove an extra include and arrange headers like
+ the trunk client for easier merging.
2008-11-04 Bjørn Lindeijer <bjorn@lindeijer.nl>