#
# ChangeLog for code/branches/merge/src/util
#
# Generated by Trac 1.0.9
# Nov 13, 2024, 1:04:16 PM

Tue, 13 May 2008 13:22:56 GMT scheusso [1262]
	* code/branches/merge (copied)

	creating merge branch


Fri, 02 May 2008 20:44:57 GMT rgrieder [1219]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/bin/keybindings.ini (copied)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/asylum/core (copied)
	* code/trunk/src/asylum/core/InputEvent.h (copied)
	* code/trunk/src/asylum/core/InputEventListener.cc (copied)
	* code/trunk/src/asylum/core/InputEventListener.h (copied)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/CorePrereqs.h (modified)
	* code/trunk/src/core/Debug.h (modified)
	* code/trunk/src/core/InputBuffer.cc (modified)
	* code/trunk/src/core/InputBuffer.h (modified)
	* code/trunk/src/core/InputEvent.h (deleted)
	* code/trunk/src/core/InputEventListener.cc (deleted)
	* code/trunk/src/core/InputEventListener.h (deleted)
	* code/trunk/src/core/InputHandler.cc (modified)
	* code/trunk/src/core/InputHandler.h (modified)
	* code/trunk/src/core/InputManager.cc (modified)
	* code/trunk/src/core/InputManager.h (modified)
	* code/trunk/src/ois (copied)
	* code/trunk/src/ois/CMakeLists.txt (copied)
	* code/trunk/src/ois/OIS.h (copied)
	* code/trunk/src/ois/OISConfig.h (copied)
	* code/trunk/src/ois/OISEffect.cpp (copied)
	* code/trunk/src/ois/OISEffect.h (copied)
	* code/trunk/src/ois/OISEvents.h (copied)
	* code/trunk/src/ois/OISException.cpp (copied)
	* code/trunk/src/ois/OISException.h (copied)
	* code/trunk/src/ois/OISFactoryCreator.h (copied)
	* code/trunk/src/ois/OISForceFeedback.cpp (copied)
	* code/trunk/src/ois/OISForceFeedback.h (copied)
	* code/trunk/src/ois/OISInputManager.cpp (copied)
	* code/trunk/src/ois/OISInputManager.h (copied)
	* code/trunk/src/ois/OISInterface.h (copied)
	* code/trunk/src/ois/OISJoyStick.cpp (copied)
	* code/trunk/src/ois/OISJoyStick.h (copied)
	* code/trunk/src/ois/OISKeyboard.cpp (copied)
	* code/trunk/src/ois/OISKeyboard.h (copied)
	* code/trunk/src/ois/OISMouse.h (copied)
	* code/trunk/src/ois/OISObject.cpp (copied)
	* code/trunk/src/ois/OISObject.h (copied)
	* code/trunk/src/ois/OISPrereqs.h (copied)
	* code/trunk/src/ois/ReadMe.txt (copied)
	* code/trunk/src/ois/linux (copied)
	* code/trunk/src/ois/linux/EventHelpers.cpp (copied)
	* code/trunk/src/ois/linux/EventHelpers.h (copied)
	* code/trunk/src/ois/linux/LinuxForceFeedback.cpp (copied)
	* code/trunk/src/ois/linux/LinuxForceFeedback.h (copied)
	* code/trunk/src/ois/linux/LinuxInputManager.cpp (copied)
	* code/trunk/src/ois/linux/LinuxInputManager.h (copied)
	* code/trunk/src/ois/linux/LinuxJoyStickEvents.cpp (copied)
	* code/trunk/src/ois/linux/LinuxJoyStickEvents.h (copied)
	* code/trunk/src/ois/linux/LinuxKeyboard.cpp (copied)
	* code/trunk/src/ois/linux/LinuxKeyboard.h (copied)
	* code/trunk/src/ois/linux/LinuxMouse.cpp (copied)
	* code/trunk/src/ois/linux/LinuxMouse.h (copied)
	* code/trunk/src/ois/linux/LinuxPrereqs.h (copied)
	* code/trunk/src/ois/mac (copied)
	* code/trunk/src/ois/mac/MacHIDManager.cpp (copied)
	* code/trunk/src/ois/mac/MacHIDManager.h (copied)
	* code/trunk/src/ois/mac/MacHelpers.cpp (copied)
	* code/trunk/src/ois/mac/MacHelpers.h (copied)
	* code/trunk/src/ois/mac/MacInputManager.cpp (copied)
	* code/trunk/src/ois/mac/MacInputManager.h (copied)
	* code/trunk/src/ois/mac/MacKeyboard.cpp (copied)
	* code/trunk/src/ois/mac/MacKeyboard.h (copied)
	* code/trunk/src/ois/mac/MacMouse.cpp (copied)
	* code/trunk/src/ois/mac/MacMouse.h (copied)
	* code/trunk/src/ois/mac/MacPrereqs.h (copied)
	* code/trunk/src/ois/win32 (copied)
	* code/trunk/src/ois/win32/Win32ForceFeedback.cpp (copied)
	* code/trunk/src/ois/win32/Win32ForceFeedback.h (copied)
	* code/trunk/src/ois/win32/Win32InputManager.cpp (copied)
	* code/trunk/src/ois/win32/Win32InputManager.h (copied)
	* code/trunk/src/ois/win32/Win32JoyStick.cpp (copied)
	* code/trunk/src/ois/win32/Win32JoyStick.h (copied)
	* code/trunk/src/ois/win32/Win32KeyBoard.cpp (copied)
	* code/trunk/src/ois/win32/Win32KeyBoard.h (copied)
	* code/trunk/src/ois/win32/Win32Mouse.cpp (copied)
	* code/trunk/src/ois/win32/Win32Mouse.h (copied)
	* code/trunk/src/ois/win32/Win32Prereqs.h (copied)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/util/String.cc (modified)
	* code/trunk/visual_studio/base_properties.vsprops (modified)
	* code/trunk/visual_studio/base_properties_release_sse.vsprops (deleted)
	* code/trunk/visual_studio/base_properties_release_sse2.vsprops (deleted)
	* code/trunk/visual_studio/core_properties.vsprops (modified)
	* code/trunk/visual_studio/loader_properties.vsprops (deleted)
	* code/trunk/visual_studio/orxonox_properties.vsprops (modified)
	* code/trunk/visual_studio/orxonox_vc8.sln (modified)
	* code/trunk/visual_studio/tolua++_properties.vsprops (deleted)
	* code/trunk/visual_studio/tolua_properties.vsprops (copied)
	* code/trunk/visual_studio/vc8/core.vcproj (modified)
	* code/trunk/visual_studio/vc8/ois.vcproj (copied)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (modified)
	* code/trunk/visual_studio/vc8/tolua++.vcproj (deleted)
	* code/trunk/visual_studio/vc8/tolua.vcproj (copied)

	merged input branch back to trunk. Not yet tested on tardis