Ignore:
Timestamp:
Oct 31, 2017, 2:09:43 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, 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:
b1e68d03, e706bfd
Parents:
6c7b1e7 (diff), e1e8408 (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:

resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tests/sched-int-wait.c

    r6c7b1e7 r0dc954b  
    6262
    6363        while( waiter_left != 0 ) {
    64             unsigned action = random( 4 );
     64                unsigned action = random( 4 );
    6565                switch( action ) {
    6666                        case 0:
Note: See TracChangeset for help on using the changeset viewer.