Changeset 3433 in orxonox.OLD for orxonox/trunk/src/gui

Timestamp:

Mar 1, 2005, 2:36:56 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged back the trackManager to the trunk.
merged with command:
svn merge -r 3369:HEAD branches/trackManager trunk
resolved conflicts in world.cc additive differences.

File:

• orxonox/trunk/src/gui/Makefile.in (modified) (1 diff)

orxonox/trunk/src/gui/Makefile.in

@@ -234 +234 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/gui/Makefile
+          $(AUTOMAKE) --gnu  src/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status