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

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/importer

Files:

• . (copied) (copied from orxonox/trunk/src/importer)
• Makefile.am (copied) (copied from orxonox/trunk/src/importer/Makefile.am)
• Makefile.in (copied) (copied from orxonox/trunk/src/importer/Makefile.in) (1 diff)
• array.cc (copied) (copied from orxonox/trunk/src/importer/array.cc)
• array.h (copied) (copied from orxonox/trunk/src/importer/array.h)
• framework.cc (copied) (copied from orxonox/trunk/src/importer/framework.cc)
• framework.h (copied) (copied from orxonox/trunk/src/importer/framework.h)
• material.cc (copied) (copied from orxonox/trunk/src/importer/material.cc)
• material.h (copied) (copied from orxonox/trunk/src/importer/material.h)
• object.cc (copied) (copied from orxonox/trunk/src/importer/object.cc)
• object.h (copied) (copied from orxonox/trunk/src/importer/object.h)
• toDo (copied) (copied from orxonox/trunk/src/importer/toDo)
• vector.cc (copied) (copied from orxonox/trunk/src/importer/vector.cc)
• vector.h (copied) (copied from orxonox/trunk/src/importer/vector.h)
• windowHandler.cc (copied) (copied from orxonox/trunk/src/importer/windowHandler.cc)
• windowHandler.h (copied) (copied from orxonox/trunk/src/importer/windowHandler.h)

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

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