Changeset 3238 in orxonox.OLD for orxonox/branches/buerli/src/console

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

Location:

orxonox/branches/buerli/src/console

Files:

• . (copied) (copied from orxonox/trunk/src/console)
• Makefile.am (copied) (copied from orxonox/trunk/src/console/Makefile.am)
• Makefile.in (copied) (copied from orxonox/trunk/src/console/Makefile.in) (1 diff)
• orxonox_console.cc (copied) (copied from orxonox/trunk/src/console/orxonox_console.cc)
• orxonox_console.h (copied) (copied from orxonox/trunk/src/console/orxonox_console.h)
• orxonox_console_entry.cc (copied) (copied from orxonox/trunk/src/console/orxonox_console_entry.cc)
• orxonox_console_entry.h (copied) (copied from orxonox/trunk/src/console/orxonox_console_entry.h)
• orxonox_console_log.cc (copied) (copied from orxonox/trunk/src/console/orxonox_console_log.cc)
• orxonox_console_log.h (copied) (copied from orxonox/trunk/src/console/orxonox_console_log.h)

orxonox/branches/buerli/src/console/Makefile.in

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