#
# ChangeLog for branches/test/Makefile.am in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 18, 2024, 3:31:59 AM

Tue, 14 Nov 2006 10:24:42 GMT patrick [9929]
	* branches/test (copied)

	created new branche for pps code session. nothing to merge back, will ...


Thu, 15 Jun 2006 10:48:26 GMT bensch [8448]
	* trunk/Makefile.am (modified)
	* trunk/configure.ac (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.h (modified)
	* trunk/src/lib/gui/gl/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.h (modified)
	* trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified)
	* trunk/src/lib/gui/gl/glgui_checkbutton.h (modified)
	* trunk/src/lib/gui/gl/glgui_defs.h (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/lib/gui/gl/glgui_image.cc (modified)
	* trunk/src/lib/gui/gl/glgui_image.h (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_pushbutton.cc (modified)
	* trunk/src/lib/gui/gl/glgui_slider.cc (modified)
	* trunk/src/lib/gui/gl/glgui_slider.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_textfield.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/math/rect2D.cc (modified)
	* trunk/src/lib/math/rect2D.h (modified)
	* trunk/src/lib/util/color.cc (modified)
	* trunk/src/lib/util/color.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)

	merged gui back to the trunk
	merged with command
	merge -r8377:HEAD ...