From c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Tue, 10 Feb 2009 16:56:05 +0100
Subject: Changed spelling from colour to color.

---
 src/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 3a562b25..209157b4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,7 +55,7 @@
 #include "gui/button.h"
 #include "gui/char_server.h"
 #include "gui/char_select.h"
-#include "gui/colour.h"
+#include "gui/color.h"
 #include "gui/gui.h"
 #include "gui/login.h"
 #include "gui/ok_dialog.h"
@@ -135,7 +135,7 @@ CharServerHandler charServerHandler;
 LoginData loginData;
 LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1);
 
-Colour *textColour;
+color *textcolor;
 
 // This anonymous namespace hides whatever is inside from other modules.
 namespace {
@@ -760,7 +760,7 @@ int main(int argc, char *argv[])
     unsigned int oldstate = !state; // We start with a status change.
 
     // Needs to be created in main, as the updater uses it
-    textColour = new Colour();
+    textcolor = new color();
 
     Game *game = NULL;
     Window *currentDialog = NULL;
@@ -1095,7 +1095,7 @@ int main(int argc, char *argv[])
         usleep(50000);
     }
 
-    delete textColour;
+    delete textcolor;
 #ifdef PACKAGE_VERSION
     delete versionLabel;
 #endif
-- 
cgit v1.2.3-70-g09d2