Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8145 in orxonox.OLD for trunk/src/orxonox.cc


Ignore:
Timestamp:
Jun 5, 2006, 11:49:26 AM (19 years ago)
Author:
bensch
Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/orxonox.cc

    r7954 r8145  
    3030#include "globals.h"
    3131
    32 #include "gui/qt_gui/qt_gui.h"
     32#include "gui/qt/qt_gui.h"
    3333
    3434#include "file.h"
Note: See TracChangeset for help on using the changeset viewer.