#
# ChangeLog for code/branches/presentationFS14/src/modules/objects/controllers
#
# Generated by Trac 1.0.9
# May 14, 2024, 3:22:17 PM

Thu, 22 May 2014 12:35:02 GMT smerkli [10072]
	* code/branches/presentationFS14 (modified)
	* code/branches/presentationFS14/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (deleted)
	* code/branches/presentationFS14/data/levels/templates/standardTurret.oxt (copied)
	* code/branches/presentationFS14/data/levels/turretTest.oxw (modified)
	* code/branches/presentationFS14/src/modules/objects/CMakeLists.txt (modified)
	* code/branches/presentationFS14/src/modules/objects/Turret.cc (modified)
	* code/branches/presentationFS14/src/modules/objects/Turret.h (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/CMakeLists.txt (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified)

	Merged turretFS14 branch


Tue, 20 May 2014 07:03:19 GMT muemart [10062]
	* code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified)

	Commit the right file this time