Changeset 4338 in orxonox.OLD for orxonox/trunk/configure.ac

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/configure.ac (modified) (2 diffs)

orxonox/trunk/configure.ac

@@ -519 +519 @@
                  src/lib/graphics/Makefile
                  src/lib/graphics/importer/Makefile
+                 src/lib/physics/Makefile
                  src/lib/gui/Makefile
                  src/lib/gui/console/Makefile
@@ -526 +527 @@
                  src/subprojects/testmain/Makefile
                  src/subprojects/importer/Makefile
+                 src/subprojects/particles/Makefile
                  src/subprojects/gui/Makefile
                  ])