Changeset 4338 in orxonox.OLD for orxonox/trunk/src/subprojects/importer

Timestamp:

May 27, 2005, 9:16:53 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

Location:

orxonox/trunk/src/subprojects/importer

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)

orxonox/trunk/src/subprojects/importer/Makefile.am

@@ -48 +48 @@
                   $(MAINSRCDIR)/lib/coord/null_parent.cc
 
-noinst_HEADERS = framework.h \
-                 windowHandler.h
+noinst_HEADERS = framework.h
+

orxonox/trunk/src/subprojects/importer/Makefile.in

@@ -212 +212 @@
                   $(MAINSRCDIR)/lib/coord/null_parent.cc
 
-noinst_HEADERS = framework.h \
-                 windowHandler.h
-
+noinst_HEADERS = framework.h
 all: all-am