#
# ChangeLog for branches/coll_rect.merge/scripts in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 4, 2024, 2:11:37 PM

Mon, 04 Dec 2006 15:02:21 GMT patrick [10009]
	* branches/coll_rect.merge (copied)

	create copy-merge-move branche


Fri, 16 Jun 2006 08:23:05 GMT bensch [8518]
	* trunk/scripts/tardis-scratch-checkout.pl (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.h (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.h (modified)
	* trunk/src/lib/gui/gl/Makefile.am (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.cc (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.h (modified)
	* trunk/src/lib/gui/gl/glgui_style.cc (modified)
	* trunk/src/lib/gui/gl/glgui_style.h (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/gui/gl/specials (copied)
	* trunk/src/lib/gui/gl/specials/glgui_notifier.cc (copied)
	* trunk/src/lib/gui/gl/specials/glgui_notifier.h (copied)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)

	merged the gui back to the trunk