#
# ChangeLog for code/trunk/src/libraries/tools/Timer.h
#
# Generated by Trac 1.0.9
# Apr 28, 2024, 3:16:12 PM

Wed, 14 Nov 2018 08:17:56 GMT merholzl [12099]
	* code/trunk (modified)
	* code/trunk/cmake/InstallCheck.cmake (modified)
	* code/trunk/cmake/tools/FindCEGUI.cmake (modified)
	* code/trunk/src/libraries/tools/Timer.h (modified)

	Merging changes for Flatpak building convenience into trunk


Wed, 17 Oct 2018 09:42:24 GMT merholzl [12047]
	* code/trunk (copied)

	Copied branch with new ogre version to trunk location


Wed, 10 Oct 2018 13:36:53 GMT merholzl [12029]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/newnewnewspacerace.oxw (modified)
	* code/branches/mergeFS18/data/levels/presentationHS12.oxw (modified)
	* code/branches/mergeFS18/data/levels/templates/SpaceRaceTemplates.oxt (copied)
	* code/branches/mergeFS18/data/levels/templates/fastship.oxt (modified)
	* code/branches/mergeFS18/data/levels/templates/spaceshipCollateralDamage.oxt (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRace.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/mergeFS18/src/orxonox/items/Engine.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	added space race improvements