Ignore:
Timestamp:
Nov 28, 2017, 4:15:13 PM (8 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:
8a62d04, 9d48a17
Parents:
4e7a4e6 (diff), 6c2ba38 (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

    r4e7a4e6 r8d5b9cf  
    178178    language = C,
    179179    style=defaultStyle,
     180    captionpos=b,
    180181    #1
    181182  }
     
    186187    language = CFA,
    187188    style=cfaStyle,
     189    captionpos=b,
    188190    #1
    189191  }
     
    194196    language = pseudo,
    195197    style=pseudoStyle,
     198    captionpos=b,
    196199    #1
    197200  }
     
    202205    language = c++,
    203206    style=defaultStyle,
     207    captionpos=b,
    204208    #1
    205209  }
     
    210214    language = c++,
    211215    style=defaultStyle,
     216    captionpos=b,
    212217    #1
    213218  }
     
    218223    language = java,
    219224    style=defaultStyle,
     225    captionpos=b,
    220226    #1
    221227  }
     
    226232    language = scala,
    227233    style=defaultStyle,
     234    captionpos=b,
    228235    #1
    229236  }
     
    234241    language = sml,
    235242    style=defaultStyle,
     243    captionpos=b,
    236244    #1
    237245  }
     
    242250    language = D,
    243251    style=defaultStyle,
     252    captionpos=b,
    244253    #1
    245254  }
     
    250259    language = rust,
    251260    style=defaultStyle,
     261    captionpos=b,
    252262    #1
    253263  }
     
    258268    language = Golang,
    259269    style=defaultStyle,
     270    captionpos=b,
    260271    #1
    261272  }
Note: See TracChangeset for help on using the changeset viewer.