Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3399 in orxonox.OLD for orxonox/branches/nico/src/console


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/nico

    • Property svn:externals set to

  • orxonox/branches/nico/src/console/Makefile.in

    r3391 r3399  
    128128SHELL = @SHELL@
    129129STRIP = @STRIP@
     130SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     131SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    130132VERSION = @VERSION@
    131133ac_ct_CC = @ac_ct_CC@
    … …  
    193195          esac; \
    194196        done; \
    195         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/console/Makefile'; \
     197        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/console/Makefile'; \
    196198        cd $(top_srcdir) && \
    197           $(AUTOMAKE) --gnu  src/console/Makefile
     199          $(AUTOMAKE) --foreign  src/console/Makefile
    198200.PRECIOUS: Makefile
    199201Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.