Ignore:
Timestamp:
Sep 19, 2017, 1:22:55 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
d22e90f
Parents:
d48e529 (diff), e06be49 (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
  • doc/proposals/concurrency/style/cfa-format.tex

    rd48e529 ra9a4771  
    166166  xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
    167167  moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
    168   morekeywords=[2]{accept, signal, signal_block, wait},
     168  morekeywords=[2]{accept, signal, signal_block, wait, waitfor},
    169169}
    170170
Note: See TracChangeset for help on using the changeset viewer.