#
# ChangeLog for code/branches/Merge_HS18/data/levels/includes/weaponSettingsHover.oxi
#
# Generated by Trac 1.0.9
# May 17, 2024, 11:29:43 PM

Tue, 11 Dec 2018 18:38:06 GMT merholzl [12185]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/OrxoKart1.oxw (copied)
	* code/branches/Merge_HS18/data/levels/OrxoKart2.oxw (copied)
	* code/branches/Merge_HS18/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/Merge_HS18/data/levels/kart_alpha0.1.oxw (copied)
	* code/branches/Merge_HS18/data/levels/templates/OrxoKartKart.oxt (copied)
	* code/branches/Merge_HS18/data/overlays/OrxoKartHUD.oxo (copied)
	* code/branches/Merge_HS18/data/tcl/orxokart_highscores.txt (copied)
	* code/branches/Merge_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/orxokart (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/svn_is_cancer (copied)

	OrxoKart 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