#
# ChangeLog for branches/cd/AUTHORS in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 24, 2024, 9:06:40 AM

Tue, 25 Apr 2006 13:07:12 GMT bensch [7364]
	* branches/cd (copied)

	branches: created new branche for the merge of the trunk and the new ...


Thu, 30 Mar 2006 09:45:31 GMT bensch [7256]
	* trunk/AUTHORS (modified)
	* trunk/configure.ac (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/defs/globals.h (modified)
	* trunk/src/lib/BuildLibs.am (modified)
	* trunk/src/lib/Makefile.am (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/event/event_handler.h (modified)
	* trunk/src/lib/event/key_mapper.cc (modified)
	* trunk/src/lib/event/key_mapper.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.h (modified)
	* trunk/src/lib/network/network_manager.cc (modified)
	* trunk/src/lib/network/network_manager.h (modified)
	* trunk/src/lib/parser/Makefile.am (modified)
	* trunk/src/lib/parser/cmdline_parser (copied)
	* trunk/src/lib/parser/cmdline_parser/Makefile.am (copied)
	* trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc (copied)
	* trunk/src/lib/parser/cmdline_parser/cmdline_parser.h (copied)
	* trunk/src/lib/parser/ini_parser/ini_parser.cc (modified)
	* trunk/src/lib/parser/ini_parser/ini_parser.h (modified)
	* trunk/src/lib/parser/preferences (copied)
	* trunk/src/lib/parser/preferences/Makefile.am (copied)
	* trunk/src/lib/parser/preferences/cmd_line_prefs_reader.cc (copied)
	* trunk/src/lib/parser/preferences/cmd_line_prefs_reader.h (copied)
	* trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc (copied)
	* trunk/src/lib/parser/preferences/ini_file_prefs_reader.h (copied)
	* trunk/src/lib/sound/sound_engine.cc (modified)
	* trunk/src/lib/sound/sound_engine.h (modified)
	* trunk/src/lib/util/preferences.cc (copied)
	* trunk/src/lib/util/preferences.h (copied)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/orxonox.h (modified)
	* trunk/src/subprojects/framework.cc (modified)

	orxonox/trunk: merged the preferences back to the trunk
	merged with ...