Ignore:
Timestamp:
Jul 26, 2017, 12:19:41 PM (8 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
b947fb2
Parents:
e0a653d (diff), ea91c42 (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/token.cc

    re0a653d r33218c6  
    1 //                              -*- Mode: C++ -*-
    21//
    3 // Copyright (C) Peter A. Buhr 2017
     2// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     3//
     4// The contents of this file are covered under the licence agreement in the
     5// file "LICENCE" distributed with Cforall.
    46//
    57// Pretty Printer, Copyright (C) Richard C. Bilson and Rodolfo G. Esteves 2001
    … …  
    1012// Created On       : Wed Jun 28 22:46:23 2017
    1113// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jun 29 09:33:49 2017
    13 // Update Count     : 9
     14// Last Modified On : Fri Jul 21 23:07:04 2017
     15// Update Count     : 10
    1416//
    1517
Note: See TracChangeset for help on using the changeset viewer.