#
# ChangeLog for code/branches/dockingsystem2
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 9:47:46 AM

Wed, 06 Apr 2011 14:26:26 GMT dafrick [8195]
	* code/branches/dockingsystem2 (copied)

	New dockingsystem branch, to avoid problems when merging it into
	trunk.


Wed, 06 Apr 2011 09:12:38 GMT dafrick [8193]
	* code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/TriggerBase.h (modified)

	Resolving bug in MultiTrigger.