Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 12, 2005, 1:26:46 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches/trackManager: merged trunk back to trackManager (again)
merged with command:
svn merge ../trunk/ trackManager/ -r 3498:HEAD
no conflicts

Location:
orxonox/branches/trackManager/src/lib/graphics
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/trackManager/src/lib/graphics/Makefile.in

    r3498 r3519  
    175175          esac; \
    176176        done; \
    177         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
     177        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
    178178        cd $(top_srcdir) && \
    179           $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
     179          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
    180180.PRECIOUS: Makefile
    181181Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/trackManager/src/lib/graphics/importer/Makefile.in

    r3498 r3519  
    215215          esac; \
    216216        done; \
    217         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
     217        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
    218218        cd $(top_srcdir) && \
    219           $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
     219          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
    220220.PRECIOUS: Makefile
    221221Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.