Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jan 7, 2006, 11:17:51 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the spaceshipcontrol branche back to the trunk

merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6224:HEAD
small conflict in space_ship.cc fixed in favor of the control

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/orxonox.cc

    r6424 r6426  
    3232#include "gui.h"
    3333
    34 #include "world.h"
    3534#include "parser/ini_parser/ini_parser.h"
    3635#include "game_loader.h"
Note: See TracChangeset for help on using the changeset viewer.