Ignore:
Timestamp:
May 30, 2017, 11:47:09 AM (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, resolv-new, with_gc
Children:
759908f, b78275b
Parents:
55f5c59 (diff), 5e8d732 (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.
git-author:
Peter A. Buhr <pabuhr@…> (05/30/17 11:44:57)
git-committer:
Peter A. Buhr <pabuhr@…> (05/30/17 11:47:09)
Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/lstlang.sty

    r55f5c59 rd6fb3c7  
    114114                __typeof__, zero_t},
    115115        morekeywords=[2]{
    116                 accept, _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex,
    117                 resume, signal, signal_block, suspend, thread, _Thread_local, wait, yield},
     116                _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex,
     117                resume, suspend, thread, _Thread_local, yield},
    118118}
    119119
Note: See TracChangeset for help on using the changeset viewer.