#
# ChangeLog for branches/cdmerge/MakeMakefile in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 30, 2024, 8:33:14 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


Thu, 20 Oct 2005 16:57:08 GMT bensch [5407]
	* trunk/MakeMakefile (added)
	* trunk/src/lib/sound/sound_engine.cc (modified)

	orxonox/trunk: sync state working on Tardis