Changeset bb37870

Timestamp:

Apr 3, 2018, 9:19:26 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

bc03be3

Parents:

9f652a1 (diff), 1031c7e (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 plg2:software/cfa/cfa-cc

File:

• src/tests/.expect/time.x86.txt (modified) (1 diff)

src/tests/.expect/time.x86.txt

@@ -6 +6 @@
 
 Fri Jan  2 00:00:00.01 1970
-Fri Jan  2 00:00:14.01 1970 0 Fri Jan  2 00:00:15.01001 1970 104414010000000
+Fri Jan  2 00:00:14.01 1970 104414010000000
+Fri Jan  2 00:00:14.01 1970 104414010000000
+0 Fri Jan  2 00:00:15.01001 1970 104414010000000
 yy/mm/dd 70/01/02 mm/dd/yy 01/02/70 mm/dd/yy 01/02/70 dd/yy/mm 02/01/70
+Wed Jul  4 00:00:01 2001 994219201000000000
 Wed Jul  4 00:00:01 2001 994219201000000000