Ignore:
Timestamp:
Aug 27, 2018, 4:40:34 PM (8 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
b7c89aa
Parents:
f9feab8 (diff), 305581d (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 cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/prettyprinter/Makefile.am

    rf9feab8 r90152a4  
    11######################## -*- Mode: Makefile-Automake -*- ######################
    2 ## 
     2##
    33## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
    44##
    55## The contents of this file are covered under the licence agreement in the
    66## file "LICENCE" distributed with Cforall.
    7 ## 
    8 ## Makefile.am -- 
    9 ## 
     7##
     8## Makefile.am --
     9##
    1010## Author           : Peter A. Buhr
    1111## Created On       : Wed Jun 28 12:07:10 2017
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Wed Jun 28 23:11:56 2017
    14 ## Update Count     : 15
     13## Last Modified On : Mon Apr 16 09:43:23 2018
     14## Update Count     : 20
    1515###############################################################################
     16
     17AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    1618
    1719BUILT_SOURCES = parser.hh
Note: See TracChangeset for help on using the changeset viewer.