Ignore:
Timestamp:
Jul 13, 2017, 3:57:23 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
bf30ab3
Parents:
1d776fd (diff), 3d4b23fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into references

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/prelude/Makefile.in

    r1d776fd r9a1e509  
    294294          esac; \
    295295        done; \
    296         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/prelude/Makefile'; \
     296        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/prelude/Makefile'; \
    297297        $(am__cd) $(top_srcdir) && \
    298           $(AUTOMAKE) --gnu src/prelude/Makefile
     298          $(AUTOMAKE) --foreign src/prelude/Makefile
    299299Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    300300        @case '$?' in \
Note: See TracChangeset for help on using the changeset viewer.