Ignore:
Timestamp:
Apr 15, 2017, 11:47:52 AM (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:
c0e7723, f891424
Parents:
6eb4398 (diff), 17f27d40 (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/bibliography/cfa.bib

    r6eb4398 r160af1e  
    433433    keywords    = {Parametric polymorphism, alphard, iterators, nested types},
    434434    contributer = {gjditchfield@plg},
     435    key         = {Alphard},
    435436    editor      = {Mary Shaw},
    436437    title       = {{ALPHARD}: Form and Content},
     
    861862
    862863@techreport{C11,
    863     type = {International Standard},
     864    type        = {International Standard},
    864865    keywords    = {ISO/IEC C 11},
    865866    contributer = {pabuhr@plg},
     
    872873
    873874@techreport{C++Concepts,
    874     type = {International Standard},
     875    type        = {International Standard},
    875876    keywords    = {ISO/IEC TS 19217:2015},
    876877    contributer = {a3moss@uwaterloo.ca},
     
    53175318    title       = {Programming with Sets: An Introduction to {SETL}},
    53185319    publisher   = {Springer},
     5320    address     = {New York, NY, USA},
    53195321    year        = 1986,
    53205322}
     
    63126314}
    63136315
    6314 @article{Sutter15,
     6316@online{Sutter15,
    63156317    contributer = {pabuhr@plg},
    63166318    author      = {Herb Sutter and Bjarne Stroustrup and Gabriel Dos Reis},
     
    67646766    number      = 6,
    67656767    month       = jun,
     6768    publisher   = {ACM},
     6769    address     = {New York, NY, USA},
    67666770    year        = 1990,
    67676771    pages       = {127-136},
Note: See TracChangeset for help on using the changeset viewer.