#
# ChangeLog for branches/cdmerge/configure.ac in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 27, 2024, 1:29:28 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


Tue, 31 Jan 2006 00:04:54 GMT bensch [6877]
	* trunk/configure.ac (modified)
	* trunk/src/lib/graphics/importer/media_container.cc (modified)

	orxonox/trunk: compiles with the new libs