#
# ChangeLog for data/pool/materials/Tower.material
#
# Generated by Trac 1.0.9
# Nov 30, 2024, 1:12:02 AM

Sun, 22 Jul 2012 20:44:22 GMT landauf [9335]
	* data/pool/materials/AUTHORS (modified)
	* data/pool/materials/Tower.material (copied)
	* data/pool/models/AUTHORS (modified)
	* data/pool/models/towerdefense (added)
	* data/pool/models/towerdefense/field (moved)
	* code/branches/presentation2012merge/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (deleted)
	* data/pool/models/towerdefense/tower (moved)
	* code/branches/presentation2012merge/src/modules/towerdefense/tower/Tower.material (deleted)

	moved tower defense blender files to pool


Sun, 03 Jun 2012 14:33:13 GMT landauf [9269]
	* code/branches/presentation2012merge (modified)
	* code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (copied)
	* code/branches/presentation2012merge/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (copied)
	* code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (copied)
	* code/branches/presentation2012merge/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (copied)
	* code/branches/presentation2012merge/data/levels/pickups.oxw (modified)
	* code/branches/presentation2012merge/data/levels/portals.oxw (modified)
	* code/branches/presentation2012merge/data/levels/surfaceRace.oxw (copied)
	* code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw (modified)
	* code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (copied)
	* code/branches/presentation2012merge/data/levels/templates/tower.oxt (copied)
	* code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified)
	* code/branches/presentation2012merge/data/levels/towerDefense.oxw (copied)
	* code/branches/presentation2012merge/data/levels/tutorial.oxw (modified)
	* code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (copied)
	* code/branches/presentation2012merge/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (copied)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (copied)
	* code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense (copied)
	* code/branches/presentation2012merge/src/orxonox/LevelInfo.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.cc (copied)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.h (copied)
	* code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged presentation2012 to presentation2012merge