Changeset 3399 in orxonox.OLD for orxonox/branches/nico/Makefile.in

Timestamp:

Feb 6, 2005, 11:27:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (2 diffs)

orxonox/branches/nico/Makefile.in

@@ -38 +38 @@
         $(srcdir)/Makefile.in $(srcdir)/config.h.in \
         $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
-        COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
-        depcomp install-sh missing mkinstalldirs
+        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+        install-sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -125 +125 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
+SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@