#
# ChangeLog for code/branches/buildsystem2/src/tinyxml
#
# Generated by Trac 1.0.9
# Nov 29, 2024, 3:30:58 AM

Mon, 12 Jan 2009 15:18:11 GMT rgrieder [2588]
	* code/branches/buildsystem2/CMakeLists.txt (modified)
	* code/branches/buildsystem2/cmake/ConfigMSVC.cmake (modified)
	* code/branches/buildsystem2/cmake/ConfigPlatforms.cmake (modified)
	* code/branches/buildsystem2/src/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/audio/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/core/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/cpptcl/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/network/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ogreceguirenderer/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ois/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/tinyxml/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/tolua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/util/CMakeLists.txt (modified)

	Visual Studio generator working for all build types. Compiles but ...


Thu, 08 Jan 2009 20:37:41 GMT rgrieder [2579]
	* code/branches/buildsystem2/CMakeLists.txt (modified)
	* code/branches/buildsystem2/cmake/ConfigMSVC.cmake (added)
	* code/branches/buildsystem2/cmake/ConfigMinGW.cmake (modified)
	* code/branches/buildsystem2/cmake/ConfigPlatforms.cmake (added)
	* code/branches/buildsystem2/cmake/ConfigTardis.cmake (modified)
	* code/branches/buildsystem2/cmake/FindALUT.cmake (modified)
	* code/branches/buildsystem2/cmake/FindCEGUI.cmake (modified)
	* code/branches/buildsystem2/cmake/FindDirectX.cmake (modified)
	* code/branches/buildsystem2/cmake/FindENet.cmake (modified)
	* code/branches/buildsystem2/cmake/FindOGRE.cmake (modified)
	* code/branches/buildsystem2/cmake/FindOggVorbis.cmake (modified)
	* code/branches/buildsystem2/cmake/HandleLibraryTypes.cmake (added)
	* code/branches/buildsystem2/src/audio/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/core/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/cpptcl/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/network/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ogreceguirenderer/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ois/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/tinyxml/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/tolua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/util/CMakeLists.txt (modified)

	- Equipped find scripts with debug/optimized functions. If you have ...


Tue, 06 Jan 2009 09:37:24 GMT rgrieder [2568]
	* code/branches/buildsystem2/cmake/FindOGRE.cmake (modified)
	* code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc (modified)
	* code/branches/buildsystem2/src/tinyxml/VERSION (moved)

	Small adjustments.
	Added OGRE_HOME environemnt variable to the path ...


Wed, 17 Dec 2008 20:05:10 GMT rgrieder [2510]
	* code/branches/buildsystem2 (modified)
	* code/branches/buildsystem2/CMakeLists.txt (modified)
	* code/branches/buildsystem2/TODO_buildsystem (modified)
	* code/branches/buildsystem2/bin/CMakeLists.txt (modified)
	* code/branches/buildsystem2/bin/linux/orxonox.ini (modified)
	* code/branches/buildsystem2/bin/linux/run-script (modified)
	* code/branches/buildsystem2/bin/mingw/orxonox.bat (modified)
	* code/branches/buildsystem2/bin/mingw/orxonox.ini (modified)
	* code/branches/buildsystem2/bin/tardis/ogre.cfg (copied)
	* code/branches/buildsystem2/bin/tardis/orxonox.ini (modified)
	* code/branches/buildsystem2/cmake/CheckOrxonoxWinDeps.cmake (modified)
	* code/branches/buildsystem2/cmake/CheckTardis.cmake (modified)
	* code/branches/buildsystem2/cmake/FindCEGUI.cmake (modified)
	* code/branches/buildsystem2/cmake/FindDirectX.cmake (modified)
	* code/branches/buildsystem2/cmake/FindENet.cmake (modified)
	* code/branches/buildsystem2/cmake/FindOGRE.cmake (modified)
	* code/branches/buildsystem2/cmake/FindOggVorbis.cmake (modified)
	* code/branches/buildsystem2/cmake/UseTolua.cmake (modified)
	* code/branches/buildsystem2/src/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/audio/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/core/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/core/LuaBind.cc (modified)
	* code/branches/buildsystem2/src/core/LuaBind.h (modified)
	* code/branches/buildsystem2/src/core/XMLIncludes.h (modified)
	* code/branches/buildsystem2/src/cpptcl/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/network/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ois/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/tinyxml/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/tolua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/tolua/all-5.0.lua (modified)
	* code/branches/buildsystem2/src/tolua/all-5.1.lua (modified)
	* code/branches/buildsystem2/src/util (modified)
	* code/branches/buildsystem2/src/util/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/util/Exception.cc (modified)
	* code/branches/buildsystem2/src/util/Exception.h (modified)
	* code/branches/buildsystem2/updateMedia.sh (deleted)
	* code/branches/buildsystem2/update_media (copied)
	* code/branches/buildsystem2/visual_studio/vc8/audio.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/base.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/ceguilua.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/core.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/cpptcl.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/debug.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/directories.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/network.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/orxonox.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln (modified)
	* code/branches/buildsystem2/visual_studio/vc8/release.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/tinyxml.vcproj (modified)
	* code/branches/buildsystem2/visual_studio/vc8/tinyxml.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/tolua.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/util.vsprops (modified)

	Merged revisions 2279-2401 of the buildsystem branch to buildsystem2.


Wed, 17 Dec 2008 19:59:48 GMT rgrieder [2509]
	* code/branches/buildsystem2 (modified)
	* code/branches/buildsystem2/CMakeLists.txt (modified)
	* code/branches/buildsystem2/TODO_buildsystem (copied)
	* code/branches/buildsystem2/bin/CMakeLists.txt (copied)
	* code/branches/buildsystem2/bin/Plugins.cfg (deleted)
	* code/branches/buildsystem2/bin/linux (copied)
	* code/branches/buildsystem2/bin/linux/orxonox.ini (copied)
	* code/branches/buildsystem2/bin/linux/run-script (copied)
	* code/branches/buildsystem2/bin/mingw (copied)
	* code/branches/buildsystem2/bin/mingw/orxonox.bat (copied)
	* code/branches/buildsystem2/bin/mingw/orxonox.ini (copied)
	* code/branches/buildsystem2/bin/msvc (copied)
	* code/branches/buildsystem2/bin/msvc/debug (copied)
	* code/branches/buildsystem2/bin/msvc/debug/orxonox_d.ini (copied)
	* code/branches/buildsystem2/bin/msvc/release (copied)
	* code/branches/buildsystem2/bin/msvc/release/orxonox.ini (copied)
	* code/branches/buildsystem2/bin/ogre.cfg-init (deleted)
	* code/branches/buildsystem2/bin/orxonox.bat (deleted)
	* code/branches/buildsystem2/bin/plugins.cfg-init (deleted)
	* code/branches/buildsystem2/bin/run-script (deleted)
	* code/branches/buildsystem2/bin/tardis (copied)
	* code/branches/buildsystem2/bin/tardis/orxonox.ini (copied)
	* code/branches/buildsystem2/cmake/CheckOrxonoxWinDeps.cmake (copied)
	* code/branches/buildsystem2/cmake/CheckTardis.cmake (modified)
	* code/branches/buildsystem2/cmake/FindALUT.cmake (modified)
	* code/branches/buildsystem2/cmake/FindBoost.cmake (deleted)
	* code/branches/buildsystem2/cmake/FindCEGUI.cmake (modified)
	* code/branches/buildsystem2/cmake/FindCEGUI_OGRE.cmake (deleted)
	* code/branches/buildsystem2/cmake/FindENet.cmake (modified)
	* code/branches/buildsystem2/cmake/FindLua.cmake (deleted)
	* code/branches/buildsystem2/cmake/FindODE.cmake (deleted)
	* code/branches/buildsystem2/cmake/FindOGRE.cmake (modified)
	* code/branches/buildsystem2/cmake/FindOggVorbis.cmake (modified)
	* code/branches/buildsystem2/cmake/FindOpenAL.cmake (deleted)
	* code/branches/buildsystem2/cmake/FindPkgConfig.cmake (deleted)
	* code/branches/buildsystem2/cmake/FindTCL.cmake (deleted)
	* code/branches/buildsystem2/cmake/FindZLIB.cmake (deleted)
	* code/branches/buildsystem2/cmake/UseTolua.cmake (copied)
	* code/branches/buildsystem2/run (modified)
	* code/branches/buildsystem2/src/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ceguilua-0.5.0 (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CEGUILua.cpp (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CEGUILua.h (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CEGUILuaFunctor.cpp (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CEGUILuaFunctor.h (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CMakeLists.txt (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/lua_CEGUI.cpp (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/required.cpp (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/required.h (copied)
	* code/branches/buildsystem2/src/ceguilua-0.5.0b (deleted)
	* code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CEGUILua.cpp (modified)
	* code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp (modified)
	* code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/lua_CEGUI.cpp (modified)
	* code/branches/buildsystem2/src/core/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/core/CommandExecutor.h (modified)
	* code/branches/buildsystem2/src/core/LuaBind.cc (modified)
	* code/branches/buildsystem2/src/core/LuaBind.h (modified)
	* code/branches/buildsystem2/src/core/XMLIncludes.h (modified)
	* code/branches/buildsystem2/src/core/tolua (deleted)
	* code/branches/buildsystem2/src/lua (deleted)
	* code/branches/buildsystem2/src/network/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/ois/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/orxonox/Settings.cc (modified)
	* code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc (modified)
	* code/branches/buildsystem2/src/orxonox/gui/GUIManager.h (modified)
	* code/branches/buildsystem2/src/orxonox/tolua (deleted)
	* code/branches/buildsystem2/src/tinyxml/changes.txt (copied)
	* code/branches/buildsystem2/src/tinyxml/readme.txt (copied)
	* code/branches/buildsystem2/src/tinyxml/ticpp.cc (modified)
	* code/branches/buildsystem2/src/tinyxml/ticpp.h (modified)
	* code/branches/buildsystem2/src/tinyxml/ticpp_trunk_r98 (copied)
	* code/branches/buildsystem2/src/tinyxml/ticpprc.h (modified)
	* code/branches/buildsystem2/src/tinyxml/tinyxml.h (modified)
	* code/branches/buildsystem2/src/tolua/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/tolua/README (copied)
	* code/branches/buildsystem2/src/tolua/all-5.0.lua (copied)
	* code/branches/buildsystem2/src/tolua/all-5.1.lua (copied)
	* code/branches/buildsystem2/src/tolua/lua/array.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/basic.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/class.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/clean.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/code.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/compat-5.1.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/compat.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/container.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/custom.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/custom_hide.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/declaration.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/define.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/doit.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/enumerate.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/feature.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/function.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/module.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/namespace.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/operator.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/package.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/typedef.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/variable.lua (modified)
	* code/branches/buildsystem2/src/tolua/lua/verbatim.lua (modified)
	* code/branches/buildsystem2/src/tolua/tolua++.h (modified)
	* code/branches/buildsystem2/src/tolua/tolua-5.1.pkg (deleted)
	* code/branches/buildsystem2/src/tolua/tolua.c (modified)
	* code/branches/buildsystem2/src/tolua/tolua_is.c (modified)
	* code/branches/buildsystem2/src/tolua/tolua_map.c (modified)
	* code/branches/buildsystem2/src/tolua/tolua_push.c (modified)
	* code/branches/buildsystem2/src/tolua/toluabind.c (deleted)
	* code/branches/buildsystem2/src/tolua/toluabind.h (deleted)
	* code/branches/buildsystem2/src/util (modified)
	* code/branches/buildsystem2/src/util/CMakeLists.txt (modified)
	* code/branches/buildsystem2/src/util/Exception.cc (modified)
	* code/branches/buildsystem2/src/util/Exception.h (modified)
	* code/branches/buildsystem2/src/util/String.cc (modified)
	* code/branches/buildsystem2/src/util/String.h (modified)
	* code/branches/buildsystem2/visual_studio/vc8/audio.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/base.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/ceguilua.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/core.vcproj (modified)
	* code/branches/buildsystem2/visual_studio/vc8/core.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/cpptcl.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/debug.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/directories.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/lua.vcproj (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/lua.vsprops (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/lua_static.vcproj (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/lua_static.vsprops (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/network.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj (modified)
	* code/branches/buildsystem2/visual_studio/vc8/orxonox.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln (modified)
	* code/branches/buildsystem2/visual_studio/vc8/release.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/tinyxml.vcproj (modified)
	* code/branches/buildsystem2/visual_studio/vc8/tinyxml.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/tolua.vsprops (modified)
	* code/branches/buildsystem2/visual_studio/vc8/tolua_static.vcproj (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/tolua_static.vsprops (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/toluaexe.vcproj (added)
	* code/branches/buildsystem2/visual_studio/vc8/toluaexe.vsprops (added)
	* code/branches/buildsystem2/visual_studio/vc8/toluagen.vcproj (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/toluagen.vsprops (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/toluagen_orxonox.vcproj (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/toluagen_orxonox.vsprops (deleted)
	* code/branches/buildsystem2/visual_studio/vc8/util.vsprops (modified)

	Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.


Wed, 17 Dec 2008 19:39:35 GMT rgrieder [2507]
	* code/branches/buildsystem2 (copied)

	Added merger branch for the build system. Probably going to merge ...


Sat, 01 Nov 2008 18:04:09 GMT landauf [2087]
	* code/trunk (modified)
	* code/trunk/TODO (modified)
	* code/trunk/bin/def_keybindings.ini (modified)
	* code/trunk/init/common/def_keybindings.ini (modified)
	* code/trunk/src/core/ArgumentCompletionFunctions.cc (modified)
	* code/trunk/src/core/BaseObject.cc (modified)
	* code/trunk/src/core/BaseObject.h (modified)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/ClassFactory.h (modified)
	* code/trunk/src/core/CommandEvaluation.cc (modified)
	* code/trunk/src/core/CommandLine.cc (modified)
	* code/trunk/src/core/CommandLine.h (modified)
	* code/trunk/src/core/ConfigValueContainer.h (modified)
	* code/trunk/src/core/ConsoleCommand.cc (modified)
	* code/trunk/src/core/ConsoleCommand.h (modified)
	* code/trunk/src/core/Core.cc (modified)
	* code/trunk/src/core/Core.h (modified)
	* code/trunk/src/core/CoreIncludes.h (modified)
	* code/trunk/src/core/CorePrereqs.h (modified)
	* code/trunk/src/core/Event.cc (copied)
	* code/trunk/src/core/Event.h (copied)
	* code/trunk/src/core/EventIncludes.h (copied)
	* code/trunk/src/core/Factory.cc (modified)
	* code/trunk/src/core/Factory.h (modified)
	* code/trunk/src/core/Functor.h (modified)
	* code/trunk/src/core/Identifier.cc (modified)
	* code/trunk/src/core/Identifier.h (modified)
	* code/trunk/src/core/Level.h (deleted)
	* code/trunk/src/core/Loader.cc (modified)
	* code/trunk/src/core/Loader.h (modified)
	* code/trunk/src/core/LuaBind.cc (copied)
	* code/trunk/src/core/LuaBind.h (copied)
	* code/trunk/src/core/Namespace.cc (modified)
	* code/trunk/src/core/Namespace.h (modified)
	* code/trunk/src/core/RootGameState.cc (modified)
	* code/trunk/src/core/Script.cc (deleted)
	* code/trunk/src/core/Script.h (deleted)
	* code/trunk/src/core/Super.h (modified)
	* code/trunk/src/core/Template.cc (copied)
	* code/trunk/src/core/Template.h (copied)
	* code/trunk/src/core/XMLFile.h (copied)
	* code/trunk/src/core/XMLIncludes.h (modified)
	* code/trunk/src/core/XMLNameListener.cc (copied)
	* code/trunk/src/core/XMLNameListener.h (copied)
	* code/trunk/src/core/XMLPort.h (modified)
	* code/trunk/src/core/input/Button.cc (modified)
	* code/trunk/src/core/input/HalfAxis.h (modified)
	* code/trunk/src/core/input/InputCommands.cc (modified)
	* code/trunk/src/core/input/InputCommands.h (modified)
	* code/trunk/src/core/input/KeyBinder.cc (modified)
	* code/trunk/src/core/input/KeyBinder.h (modified)
	* code/trunk/src/core/tolua/tolua.pkg (modified)
	* code/trunk/src/lua/COPYRIGHT (modified)
	* code/trunk/src/lua/README (modified)
	* code/trunk/src/network/CMakeLists.txt (modified)
	* code/trunk/src/network/ChatListener.cc (copied)
	* code/trunk/src/network/ChatListener.h (copied)
	* code/trunk/src/network/Client.cc (modified)
	* code/trunk/src/network/Client.h (modified)
	* code/trunk/src/network/ClientConnection.cc (modified)
	* code/trunk/src/network/ClientConnection.h (modified)
	* code/trunk/src/network/ClientConnectionListener.cc (copied)
	* code/trunk/src/network/ClientConnectionListener.h (copied)
	* code/trunk/src/network/ClientInformation.cc (modified)
	* code/trunk/src/network/ClientInformation.h (modified)
	* code/trunk/src/network/ConnectionManager.cc (modified)
	* code/trunk/src/network/ConnectionManager.h (modified)
	* code/trunk/src/network/GamestateClient.cc (modified)
	* code/trunk/src/network/GamestateClient.h (modified)
	* code/trunk/src/network/GamestateHandler.h (modified)
	* code/trunk/src/network/GamestateManager.cc (modified)
	* code/trunk/src/network/GamestateManager.h (modified)
	* code/trunk/src/network/Host.cc (modified)
	* code/trunk/src/network/Host.h (modified)
	* code/trunk/src/network/NetworkCallback.h (modified)
	* code/trunk/src/network/NetworkPrereqs.h (modified)
	* code/trunk/src/network/PacketBuffer.h (modified)
	* code/trunk/src/network/Server.cc (modified)
	* code/trunk/src/network/Server.h (modified)
	* code/trunk/src/network/Synchronisable.cc (modified)
	* code/trunk/src/network/Synchronisable.h (modified)
	* code/trunk/src/network/packet/Acknowledgement.h (modified)
	* code/trunk/src/network/packet/Chat.h (modified)
	* code/trunk/src/network/packet/ClassID.h (modified)
	* code/trunk/src/network/packet/DeleteObjects.h (modified)
	* code/trunk/src/network/packet/Gamestate.cc (modified)
	* code/trunk/src/network/packet/Gamestate.h (modified)
	* code/trunk/src/network/packet/Packet.cc (modified)
	* code/trunk/src/network/packet/Packet.h (modified)
	* code/trunk/src/network/packet/Welcome.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/CameraManager.cc (copied)
	* code/trunk/src/orxonox/CameraManager.h (copied)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)
	* code/trunk/src/orxonox/GraphicsEngine.h (modified)
	* code/trunk/src/orxonox/LevelManager.cc (copied)
	* code/trunk/src/orxonox/LevelManager.h (copied)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/Settings.cc (modified)
	* code/trunk/src/orxonox/Settings.h (modified)
	* code/trunk/src/orxonox/SignalHandler.cc (deleted)
	* code/trunk/src/orxonox/SignalHandler.h (deleted)
	* code/trunk/src/orxonox/gamestates/GSClient.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSClient.h (modified)
	* code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSDedicated.h (modified)
	* code/trunk/src/orxonox/gamestates/GSGUI.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/trunk/src/orxonox/gamestates/GSIOConsole.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.h (modified)
	* code/trunk/src/orxonox/gamestates/GSStandalone.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSStandalone.h (modified)
	* code/trunk/src/orxonox/gui/GUIManager.cc (modified)
	* code/trunk/src/orxonox/gui/OgreCEGUIRenderer.cpp (modified)
	* code/trunk/src/orxonox/gui/OgreCEGUIResourceProvider.cpp (modified)
	* code/trunk/src/orxonox/gui/OgreCEGUITexture.cpp (modified)
	* code/trunk/src/orxonox/objects/Ambient.cc (deleted)
	* code/trunk/src/orxonox/objects/Ambient.h (deleted)
	* code/trunk/src/orxonox/objects/Backlight.cc (deleted)
	* code/trunk/src/orxonox/objects/Backlight.h (deleted)
	* code/trunk/src/orxonox/objects/BillboardProjectile.cc (deleted)
	* code/trunk/src/orxonox/objects/BillboardProjectile.h (deleted)
	* code/trunk/src/orxonox/objects/Camera.cc (deleted)
	* code/trunk/src/orxonox/objects/Camera.h (deleted)
	* code/trunk/src/orxonox/objects/CameraHandler.cc (deleted)
	* code/trunk/src/orxonox/objects/CameraHandler.h (deleted)
	* code/trunk/src/orxonox/objects/EventDispatcher.cc (copied)
	* code/trunk/src/orxonox/objects/EventDispatcher.h (copied)
	* code/trunk/src/orxonox/objects/EventListener.cc (copied)
	* code/trunk/src/orxonox/objects/EventListener.h (copied)
	* code/trunk/src/orxonox/objects/EventTarget.cc (copied)
	* code/trunk/src/orxonox/objects/EventTarget.h (copied)
	* code/trunk/src/orxonox/objects/Model.cc (deleted)
	* code/trunk/src/orxonox/objects/Model.h (deleted)
	* code/trunk/src/orxonox/objects/NPC.cc (deleted)
	* code/trunk/src/orxonox/objects/NPC.h (deleted)
	* code/trunk/src/orxonox/objects/ParticleProjectile.cc (deleted)
	* code/trunk/src/orxonox/objects/ParticleProjectile.h (deleted)
	* code/trunk/src/orxonox/objects/ParticleSpawner.cc (deleted)
	* code/trunk/src/orxonox/objects/ParticleSpawner.h (deleted)
	* code/trunk/src/orxonox/objects/Projectile.cc (deleted)
	* code/trunk/src/orxonox/objects/Projectile.h (deleted)
	* code/trunk/src/orxonox/objects/Radar.cc (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.h (modified)
	* code/trunk/src/orxonox/objects/RotatingProjectile.cc (deleted)
	* code/trunk/src/orxonox/objects/RotatingProjectile.h (deleted)
	* code/trunk/src/orxonox/objects/Scene.cc (copied)
	* code/trunk/src/orxonox/objects/Scene.h (copied)
	* code/trunk/src/orxonox/objects/Script.cc (copied)
	* code/trunk/src/orxonox/objects/Script.h (copied)
	* code/trunk/src/orxonox/objects/Skybox.cc (deleted)
	* code/trunk/src/orxonox/objects/Skybox.h (deleted)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (deleted)
	* code/trunk/src/orxonox/objects/SpaceShip.h (deleted)
	* code/trunk/src/orxonox/objects/SpaceShipAI.cc (deleted)
	* code/trunk/src/orxonox/objects/SpaceShipAI.h (deleted)
	* code/trunk/src/orxonox/objects/Test.cc (copied)
	* code/trunk/src/orxonox/objects/Test.h (copied)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (deleted)
	* code/trunk/src/orxonox/objects/WorldEntity.h (deleted)
	* code/trunk/src/orxonox/objects/controllers (copied)
	* code/trunk/src/orxonox/objects/controllers/Controller.cc (copied)
	* code/trunk/src/orxonox/objects/controllers/Controller.h (copied)
	* code/trunk/src/orxonox/objects/controllers/HumanController.cc (copied)
	* code/trunk/src/orxonox/objects/controllers/HumanController.h (copied)
	* code/trunk/src/orxonox/objects/gametypes (copied)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.cc (copied)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.h (copied)
	* code/trunk/src/orxonox/objects/infos (copied)
	* code/trunk/src/orxonox/objects/infos/HumanPlayer.cc (copied)
	* code/trunk/src/orxonox/objects/infos/HumanPlayer.h (copied)
	* code/trunk/src/orxonox/objects/infos/Info.cc (copied)
	* code/trunk/src/orxonox/objects/infos/Info.h (copied)
	* code/trunk/src/orxonox/objects/infos/Level.cc (copied)
	* code/trunk/src/orxonox/objects/infos/Level.h (copied)
	* code/trunk/src/orxonox/objects/infos/PlayerInfo.cc (copied)
	* code/trunk/src/orxonox/objects/infos/PlayerInfo.h (copied)
	* code/trunk/src/orxonox/objects/worldentities (copied)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/Billboard.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/Billboard.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/BlinkingBillboard.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/BlinkingBillboard.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/Camera.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/Camera.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/CameraPosition.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/CameraPosition.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/Light.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/Light.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/Model.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/Model.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/MovableEntity.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/PositionableEntity.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/PositionableEntity.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/SpawnPoint.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/SpawnPoint.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/WorldEntity.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/EventTrigger.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/EventTrigger.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (copied)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.h (modified)
	* code/trunk/src/orxonox/overlays/OverlayText.cc (modified)
	* code/trunk/src/orxonox/overlays/OverlayText.h (modified)
	* code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/overlays/console/InGameConsole.h (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugFPSText.cc (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugFPSText.h (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugRTRText.cc (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugRTRText.h (modified)
	* code/trunk/src/orxonox/overlays/hud/ChatOverlay.cc (copied)
	* code/trunk/src/orxonox/overlays/hud/ChatOverlay.h (copied)
	* code/trunk/src/orxonox/overlays/hud/HUDBar.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDBar.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDNavigation.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDRadar.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDRadar.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDSpeedBar.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDSpeedBar.h (modified)
	* code/trunk/src/orxonox/tools/BillboardSet.cc (modified)
	* code/trunk/src/orxonox/tools/BillboardSet.h (modified)
	* code/trunk/src/orxonox/tools/Light.cc (deleted)
	* code/trunk/src/orxonox/tools/Light.h (deleted)
	* code/trunk/src/orxonox/tools/Mesh.cc (modified)
	* code/trunk/src/orxonox/tools/Mesh.h (modified)
	* code/trunk/src/orxonox/tools/ParticleInterface.cc (modified)
	* code/trunk/src/orxonox/tools/ParticleInterface.h (modified)
	* code/trunk/src/orxonox/tools/Timer.cc (modified)
	* code/trunk/src/orxonox/tools/Timer.h (modified)
	* code/trunk/src/tinyxml/ticpp.h (modified)
	* code/trunk/src/tolua/lua/array.lua (modified)
	* code/trunk/src/tolua/lua/basic.lua (modified)
	* code/trunk/src/tolua/lua/class.lua (modified)
	* code/trunk/src/tolua/lua/clean.lua (modified)
	* code/trunk/src/tolua/lua/code.lua (modified)
	* code/trunk/src/tolua/lua/compat-5.1.lua (modified)
	* code/trunk/src/tolua/lua/compat.lua (modified)
	* code/trunk/src/tolua/lua/container.lua (modified)
	* code/trunk/src/tolua/lua/custom.lua (modified)
	* code/trunk/src/tolua/lua/custom_hide.lua (modified)
	* code/trunk/src/tolua/lua/declaration.lua (modified)
	* code/trunk/src/tolua/lua/define.lua (modified)
	* code/trunk/src/tolua/lua/doit.lua (modified)
	* code/trunk/src/tolua/lua/enumerate.lua (modified)
	* code/trunk/src/tolua/lua/feature.lua (modified)
	* code/trunk/src/tolua/lua/function.lua (modified)
	* code/trunk/src/tolua/lua/module.lua (modified)
	* code/trunk/src/tolua/lua/namespace.lua (modified)
	* code/trunk/src/tolua/lua/operator.lua (modified)
	* code/trunk/src/tolua/lua/package.lua (modified)
	* code/trunk/src/tolua/lua/typedef.lua (modified)
	* code/trunk/src/tolua/lua/variable.lua (modified)
	* code/trunk/src/tolua/lua/verbatim.lua (modified)
	* code/trunk/src/tolua/tolua-5.1.pkg (modified)
	* code/trunk/src/util (modified)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/Convert.h (modified)
	* code/trunk/src/util/Debug.h (modified)
	* code/trunk/src/util/Exception.cc (modified)
	* code/trunk/src/util/Exception.h (modified)
	* code/trunk/src/util/Math.cc (modified)
	* code/trunk/src/util/Math.h (modified)
	* code/trunk/src/util/MathConvert.h (copied)
	* code/trunk/src/util/MultiType.cc (modified)
	* code/trunk/src/util/MultiType.h (modified)
	* code/trunk/src/util/MultiTypeValue.h (modified)
	* code/trunk/src/util/OutputHandler.cc (modified)
	* code/trunk/src/util/SignalHandler.cc (copied)
	* code/trunk/src/util/SignalHandler.h (copied)
	* code/trunk/src/util/String.cc (modified)
	* code/trunk/src/util/String.h (modified)
	* code/trunk/updateMedia.sh (modified)
	* code/trunk/visual_studio/vc8/audio.vcproj (modified)
	* code/trunk/visual_studio/vc8/audio.vsprops (modified)
	* code/trunk/visual_studio/vc8/base.vsprops (modified)
	* code/trunk/visual_studio/vc8/ceguilua.vcproj (modified)
	* code/trunk/visual_studio/vc8/ceguilua.vsprops (modified)
	* code/trunk/visual_studio/vc8/core.vcproj (modified)
	* code/trunk/visual_studio/vc8/core.vsprops (modified)
	* code/trunk/visual_studio/vc8/cpptcl.vcproj (modified)
	* code/trunk/visual_studio/vc8/cpptcl.vsprops (modified)
	* code/trunk/visual_studio/vc8/debug.vsprops (modified)
	* code/trunk/visual_studio/vc8/directories.vsprops (modified)
	* code/trunk/visual_studio/vc8/lua.vcproj (modified)
	* code/trunk/visual_studio/vc8/lua.vsprops (modified)
	* code/trunk/visual_studio/vc8/lua_static.vcproj (modified)
	* code/trunk/visual_studio/vc8/lua_static.vsprops (modified)
	* code/trunk/visual_studio/vc8/network.vcproj (modified)
	* code/trunk/visual_studio/vc8/network.vsprops (modified)
	* code/trunk/visual_studio/vc8/ois.vcproj (modified)
	* code/trunk/visual_studio/vc8/ois.vsprops (modified)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (modified)
	* code/trunk/visual_studio/vc8/orxonox.vcproj.user (modified)
	* code/trunk/visual_studio/vc8/orxonox.vsprops (modified)
	* code/trunk/visual_studio/vc8/orxonox_vc8.sln (modified)
	* code/trunk/visual_studio/vc8/release.vsprops (modified)
	* code/trunk/visual_studio/vc8/tinyxml.vcproj (modified)
	* code/trunk/visual_studio/vc8/tinyxml.vsprops (modified)
	* code/trunk/visual_studio/vc8/tolua.vcproj (modified)
	* code/trunk/visual_studio/vc8/tolua.vsprops (modified)
	* code/trunk/visual_studio/vc8/tolua_static.vcproj (modified)
	* code/trunk/visual_studio/vc8/tolua_static.vsprops (modified)
	* code/trunk/visual_studio/vc8/toluagen.vcproj (modified)
	* code/trunk/visual_studio/vc8/toluagen.vsprops (modified)
	* code/trunk/visual_studio/vc8/toluagen_orxonox.vcproj (modified)
	* code/trunk/visual_studio/vc8/toluagen_orxonox.vsprops (modified)
	* code/trunk/visual_studio/vc8/util.vcproj (modified)
	* code/trunk/visual_studio/vc8/util.vsprops (modified)

	merged objecthierarchy branch back to trunk