Changeset 3423 in orxonox.OLD for orxonox/trunk/src/gui/orxonox_gui.h

Timestamp:

Feb 27, 2005, 7:11:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:

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

orxonox/trunk/src/gui/orxonox_gui.h

@@ -25 +25 @@
 {
  public:
-  OrxonoxGui (int argc, char *argv[]);
-  ~OrxonoxGui ();
+  OrxonoxGui(int argc, char *argv[]);
+  ~OrxonoxGui(void);
 
 };
 
-
-
 #endif /* _ORXONOX_GUI_H */