Changeset 3625 in orxonox.OLD for orxonox/trunk/src/lib/gui/gui/orxonox_gui.cc

Timestamp:

Mar 22, 2005, 1:37:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branches/updater back to the trunk.
merged with command
svn merge -r 3423:HEAD branches/updater/src/gui trunk/src/lib/graphics/gui/gui.

I do not wish to make such jokes again, because it is even worse than copy-pasting. All Files had to be eddited manually, and many diffs where a little bit strange (artifacts).

File:

• orxonox/trunk/src/lib/gui/gui/orxonox_gui.cc (modified) (1 diff)

orxonox/trunk/src/lib/gui/gui/orxonox_gui.cc

@@ -95 +95 @@
 
   // Reading Values from File
-  exec->setFilename("~/.orxonox.conf");
+  exec->setConfFile("~/.orxonox/orxonox.conf");
   exec->readFromFile(orxonoxGUI);
   // Merging changes to the Options from appended flags.