Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum
Timestamp:
Jan 7, 2006, 11:17:51 PM (20 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 copied

Note: See TracChangeset for help on using the changeset viewer.