From 9475a009e95a3f379a0e97bc66d1aab93ca24b34 Mon Sep 17 00:00:00 2001
From: Dennis Friis <peavey@placid.dk>
Date: Thu, 6 Nov 2008 13:59:03 +0000
Subject: Remove an extra include and arrange headers like the trunk client for
 easier merging.

---
 ChangeLog         | 4 +++-
 src/equipment.cpp | 4 +---
 2 files changed, 4 insertions(+), 4 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>
 
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():
-- 
cgit v1.2.3-70-g09d2