#
# ChangeLog for orxonox/branches/guiMerge in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 13, 2024, 5:48:56 PM

Wed, 04 May 2005 17:30:18 GMT bensch [4045]
	* orxonox/branches/guiMerge/src/Makefile.am (modified)
	* orxonox/branches/guiMerge/src/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/orxonox.cc (modified)

	orxonox/branches/guiMerge: little patch, (1 segfaults less)


Wed, 04 May 2005 17:17:38 GMT bensch [4044]
	* orxonox/branches/guiMerge/Makefile.in (modified)
	* orxonox/branches/guiMerge/aclocal.m4 (modified)
	* orxonox/branches/guiMerge/configure (modified)
	* orxonox/branches/guiMerge/configure.ac (modified)
	* orxonox/branches/guiMerge/src/Makefile.am (modified)
	* orxonox/branches/guiMerge/src/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/lib/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/lib/graphics/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/lib/graphics/importer/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/lib/gui/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/lib/gui/console/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/lib/gui/gui/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui.cc (modified)
	* orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_exec.cc (modified)
	* orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_main.cc (modified)
	* orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_update.cc (modified)
	* orxonox/branches/guiMerge/src/orxonox.cc (modified)
	* orxonox/branches/guiMerge/src/subprojects/Makefile.in (modified)
	* orxonox/branches/guiMerge/src/subprojects/testmain/Makefile.in (modified)

	orxonox/branches/guiMerge: merged the Gui into the orxonox-binary, ...


Wed, 04 May 2005 17:10:21 GMT bensch [4043]
	* orxonox/branches/guiMerge (copied)

	orxonox/branches: added branche guiMerge


Wed, 04 May 2005 16:04:16 GMT bensch [4042]
	* orxonox/trunk/src/lib/gui/gui/orxonox_gui_exec.cc (modified)
	* orxonox/trunk/src/lib/gui/gui/orxonox_gui_exec.h (modified)
	* orxonox/trunk/src/lib/gui/gui/orxonox_gui_update.cc (modified)
	* orxonox/trunk/src/orxonox.cc (modified)

	orxonox/trunk: gui: minor niceness-patch