#
# ChangeLog for code/branches/Merge_HS18/src/libraries/tools/Timer.cc
#
# Generated by Trac 1.0.9
# May 25, 2024, 8:51:51 PM

Tue, 11 Dec 2018 17:53:27 GMT merholzl [12184]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/Wagnis.oxw (copied)
	* code/branches/Merge_HS18/data/levels/templates/wagnisCursor.oxt (copied)
	* code/branches/Merge_HS18/data/overlays/WagnisHUD.oxo (copied)
	* code/branches/Merge_HS18/src/libraries/tools/Timer.cc (modified)
	* code/branches/Merge_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/wagnis (copied)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/WagnisProjectile.cc (copied)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/WagnisProjectile.h (copied)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/WagnisGun.cc (copied)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/WagnisGun.h (copied)

	Wagnis Merge


Tue, 11 Dec 2018 12:50:03 GMT merholzl [12178]
	* code/branches/Merge_HS18 (copied)

	MergeBranch


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

	Copied branch with new ogre version to trunk location