Ignore:
Timestamp:
Jan 19, 2017, 11:04:27 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, with_gc
Children:
2175062
Parents:
5ebb2fbc (diff), 68e6031 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tests/coroutine.c

    r5ebb2fbc re9e4e9ee  
    1515}
    1616
    17 void co_main(Fibonacci* this) {
     17void main(Fibonacci* this) {
    1818#ifdef MORE_DEBUG
    1919      sout | "Starting main of coroutine " | this | endl;
Note: See TracChangeset for help on using the changeset viewer.