#
# ChangeLog for code/branches/presentationFS15merge/src/orxonox/controllers/Controller.cc
#
# Generated by Trac 1.0.9
# May 25, 2024, 7:25:10 AM

Sun, 27 Sep 2015 10:11:43 GMT landauf [10595]
	* code/branches/presentationFS15merge (copied)

	created new branch to merge all branches from FS15 in a clean way


Thu, 21 Nov 2013 14:57:23 GMT jo [9797]
	* code/trunk/src/orxonox/controllers/Controller.cc (modified)
	* code/trunk/src/orxonox/controllers/Controller.h (modified)
	* code/trunk/src/orxonox/controllers/FormationController.cc (modified)
	* code/trunk/src/orxonox/controllers/FormationController.h (modified)

	Added Team functionality down to the controller class.