From a237a2d7723b94df6cd3e91401ec28388de6f1a0 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 21 Oct 2007 23:02:47 +0000
Subject: namespace cleanup

---
 src/server/main.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/server/main.cc')

diff --git a/src/server/main.cc b/src/server/main.cc
index 3ce5197..6f71468 100644
--- a/src/server/main.cc
+++ b/src/server/main.cc
@@ -1,4 +1,5 @@
-/* server/main.cc
+/*
+   server/main.cc
    This file is part of the Osirion project and is distributed under 
    the terms and conditions of the GNU General Public License version 2 
 */
@@ -21,7 +22,7 @@ int main( int argc, char *argv[] )
 {
 	const float server_framerate =  1.0f / 20.0f;
 	std::cout << "The Osirion project " << OSIRION_VERSION << std::endl;
-	Timer timer;
+	server::Timer timer;
 
     	// initialize game
 	game::init();
-- 
cgit v1.2.3