Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2995 in orxonox.OLD for orxonox/trunk/src


Ignore:
Timestamp:
Nov 26, 2004, 2:49:55 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/osX back into the Trunk.
Conflicts resolved in Favor of trunk in all the Makefiles, and fixed many strange entries in configure.ac
merged with command: svn merge branches/osX/ trunk/ -r 2887:HEAD
AND most Important of all: change back to AUTOMAKE-1.7

Location:
orxonox/trunk/src
Files:
4 edited

Legend:

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