Changeset f678663e for src/main.cc

Timestamp:

Jul 30, 2015, 4:08:34 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

8c84ebd, ae4c85a

Parents:

5aa708c (diff), 093f1a0 (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 /u/cforall/software/cfa/cfa-cc

Conflicts:

src/main.cc

File:

• src/main.cc (modified) (2 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 28 13:05:02 2015
-// Update Count     : 165
+// Last Modified On : Thu Jul 30 16:08:18 2015
+// Update Count     : 167
 //
 
@@ -339 +339 @@
 
         printAll( decls, std::cout );
+        deleteAll( translationUnit );
 }