#
# ChangeLog for branches/cdmerge/ChangeLog in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 23, 2024, 9:27:39 PM

Tue, 31 Jan 2006 13:01:16 GMT patrick [6891]
	* branches/cdmerge (copied)
	* branches/cdmerge/src/lib/graphics/effects/lense_flare.cc (copied)
	* branches/cdmerge/src/lib/graphics/effects/lense_flare.h (copied)
	* branches/cdmerge/src/lib/graphics/render2D/billboard.cc (copied)

	branches: added cdmerge branche for merging war


Fri, 09 Dec 2005 23:35:06 GMT bensch [6006]
	* trunk/ChangeLog (modified)

	orxonox/trunk: changelog