#
# ChangeLog for code/branches/shader_HS18/src/libraries/tools/Timer.h
#
# Generated by Trac 1.0.9
# May 28, 2024, 4:20:29 AM

Sun, 11 Nov 2018 16:38:58 GMT wiesep [12098]
	* code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (modified)
	* code/branches/shader_HS18/src/libraries/tools/Mesh.cc (modified)
	* code/branches/shader_HS18/src/libraries/tools/Timer.h (modified)

	Working version


Wed, 17 Oct 2018 07:06:50 GMT merholzl [12034]
	* code/branches/shader_HS18 (copied)

	New branch for shader


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