Ignore:
Timestamp:
May 1, 2023, 4:19:09 PM (3 years ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, master
Children:
c083c3d
Parents:
a50fdfb (diff), 985b624 (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:

resolved merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/bibliography/pl.bib

    ra50fdfb r6e1e2d0  
    74537453}
    74547454
     7455@inproceedings{Kahn74,
     7456    keywords    = {programming language, obect-oriented, polymorphism},
     7457    contributer = {pabuhr@plg},
     7458    title       = {The Semantics of a Simple Language for Parallel Programming},
     7459    author      = {Gilles Kahn},
     7460    booktitle   = {IFIP Congress},
     7461    year        = 1974,
     7462}
     7463
    74557464@article{Baker78,
    74567465    keywords    = {Algol display, FUNARG's, Lisp 1.5, deep binding, environment trees, multiprogramming, shallow binding},
Note: See TracChangeset for help on using the changeset viewer.