Changeset 4338 in orxonox.OLD for orxonox/trunk/src/subprojects/Makefile.am

Timestamp:

May 27, 2005, 9:16:53 PM (19 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 :/

File:

• orxonox/trunk/src/subprojects/Makefile.am (modified) (1 diff)

orxonox/trunk/src/subprojects/Makefile.am

@@ -1 +1 @@
 SUBDIRS = importer \
+          particles \
           gui \
           testmain
+
+noinst_HEADERS = framework.h
+
+
+EXTRA_DIST = framework.cc
+