#
# ChangeLog for code/branches/dockingsystem2/data/DefaultResources.oxr
#
# Generated by Trac 1.0.9
# Nov 16, 2024, 3:52:26 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.


Fri, 03 Dec 2010 13:37:11 GMT dafrick [7709]
	* code/trunk (modified)
	* code/trunk/data/DefaultResources.oxr (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/tools/ResourceLocation.cc (modified)

	Merging data_cleanup branch.  You will need to update your data ...