Ignore:
Timestamp:
Aug 25, 2019, 8:48:51 AM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
2aab69b, 5a43ab8
Parents:
f9bf142 (diff), bbb1b35 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tools/prettyprinter/Makefile.in

    rf9bf142 r330d933  
    254254CYGPATH_W = @CYGPATH_W@
    255255DEFS = @DEFS@
     256DEMANGLER = @DEMANGLER@
    256257DEPDIR = @DEPDIR@
    257258DLLTOOL = @DLLTOOL@
    … …  
    279280LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    280281LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     282LIBDEMANGLE = @LIBDEMANGLE@
    281283LIBOBJS = @LIBOBJS@
    282284LIBS = @LIBS@
Note: See TracChangeset for help on using the changeset viewer.