Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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/gui/Makefile.in

    r3391 r3399  
    135135SHELL = @SHELL@
    136136STRIP = @STRIP@
     137SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     138SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    137139VERSION = @VERSION@
    138140ac_ct_CC = @ac_ct_CC@
    … …  
    220222          esac; \
    221223        done; \
    222         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gui/Makefile'; \
     224        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
    223225        cd $(top_srcdir) && \
    224           $(AUTOMAKE) --gnu  src/gui/Makefile
     226          $(AUTOMAKE) --foreign  src/gui/Makefile
    225227.PRECIOUS: Makefile
    226228Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.