← Back to branch summary

~ubuntu-branches/ubuntu/wily/coq-doc/wily

« back to all changes in this revision

Viewing changes to doc/RecTutorial/manbiblio.bib

  • Committer: Package Import Robot
  • Author(s): Stéphane Glondu
  • Date: 2012-01-03 23:42:48 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20120103234248-p9r8h1579n67v55a
Tags: 8.3pl3-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/RecTutorial/manbiblio.bib
467
467
  number = {204},
468
468
}
469
469
 
470
 
<<<<<<< biblio.bib
471
 
 
472
 
 
473
 
=======
474
 
>>>>>>> 1.4
475
470
@INPROCEEDINGS{Gir70,
476
471
        AUTHOR             = {J.-Y. Girard},
477
472
        BOOKTITLE          = {Proceedings of the 2nd Scandinavian Logic Symposium},