#
# ChangeLog for branches/cdmerge/NEWS in orxonox.OLD
#
# Generated by Trac 1.0.9
# Sep 22, 2024, 8:07:46 AM

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, 23 Dec 2005 13:22:07 GMT bensch [6272]
	* trunk/NEWS (modified)

	orxonox/trunk: NEWS update