[Orxonox-commit 996] r5717 - in code/branches/libraries2/src: libraries orxonox orxonox/objects/pickup

[landauf at orxonox.net]

Author: landauf
Date: 2009-08-31 16:36:48 +0200 (Mon, 31 Aug 2009)
New Revision: 5717

Added:
   code/branches/libraries2/src/libraries/tools/
Removed:
   code/branches/libraries2/src/orxonox/tools/
Modified:
   code/branches/libraries2/src/libraries/CMakeLists.txt
   code/branches/libraries2/src/orxonox/CMakeLists.txt
   code/branches/libraries2/src/orxonox/objects/pickup/ModifierPickup.h
Log:
moved tools to libraries

Modified: code/branches/libraries2/src/libraries/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/libraries/CMakeLists.txt	2009-08-31 14:25:09 UTC (rev 5716)
+++ code/branches/libraries2/src/libraries/CMakeLists.txt	2009-08-31 14:36:48 UTC (rev 5717)
@@ -21,4 +21,5 @@
 
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(network)
+ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(util)

Modified: code/branches/libraries2/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/orxonox/CMakeLists.txt	2009-08-31 14:25:09 UTC (rev 5716)
+++ code/branches/libraries2/src/orxonox/CMakeLists.txt	2009-08-31 14:36:48 UTC (rev 5717)
@@ -33,7 +33,6 @@
 ADD_SUBDIRECTORY(overlays)
 ADD_SUBDIRECTORY(objects)
 ADD_SUBDIRECTORY(sound)
-ADD_SUBDIRECTORY(tools)
 
 # Translate argument
 IF(ORXONOX_USE_WINMAIN)

Modified: code/branches/libraries2/src/orxonox/objects/pickup/ModifierPickup.h
===================================================================
--- code/branches/libraries2/src/orxonox/objects/pickup/ModifierPickup.h	2009-08-31 14:25:09 UTC (rev 5716)
+++ code/branches/libraries2/src/orxonox/objects/pickup/ModifierPickup.h	2009-08-31 14:36:48 UTC (rev 5717)
@@ -39,7 +39,7 @@
 #include <climits>
 #include <map>
 
-#include "orxonox/tools/Timer.h"
+#include "tools/Timer.h"
 #include "ModifierType.h"
 #include "PassiveItem.h"