diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/equipment.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -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> diff --git a/src/equipment.cpp b/src/equipment.cpp index d1f9a6cf..b54988a7 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -21,11 +21,9 @@ * $Id$ */ -#include "equipment.h" - #include <algorithm> -#include "item.h" +#include "equipment.h" #include "item.h" Equipment::Equipment(): |