#
# ChangeLog for code/branches/Merge_HS18/svn_is_cancer/materials
#
# Generated by Trac 1.0.9
# May 25, 2024, 7:05:28 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


Wed, 07 Nov 2018 09:48:46 GMT cadick [12082]
	* code/branches/OrxoKart_HS18/svn_is_cancer/images/textures/OrxoKartStreckenabschnitt.png (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/images/textures/OrxoKartStreckenabschnittZiel.png (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/materials/OrxoKartStreckenabschnitt.material (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/materials/OrxoKartStreckenabschnittZiel.material (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/models/OrxoKartStreckenabschnitt.mesh (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/models/OrxoKartStreckenabschnittZiel.mesh (added)

	added textures for Strecke