Changeset 4f9636f for src/tests/.expect/concurrent

Timestamp:

May 5, 2017, 11:05:53 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

982ed5b, c10ee66

Parents:

45a4ea7 (diff), bd951f7 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/tests/.expect/concurrent

Files:

• sched-int-barge.txt (moved) (moved from src/tests/.expect/concurrent/sched-int-multi.txt )
• sched-int-disjoint.txt (added)
• sched-int-multi2.txt (deleted)
• sched-int-wait.txt (added)
• sched-int.txt (deleted)