Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: extradoc
Changeset: r5388:f72b1d32ce88
Date: 2014-08-20 19:31 +0200
http://bitbucket.org/pypy/extradoc/changeset/f72b1d32ce88/

Log:    merge

diff --git a/talk/dls2014/paper/paper.pdf b/talk/dls2014/paper/paper.pdf
index 
1b6090da505763b644a566a54df6a1b33bfeed25..82f177e29577ffb3c99b4b6829fd6e829fe20d59
GIT binary patch

[cut]

diff --git a/talk/dls2014/paper/paper.tex b/talk/dls2014/paper/paper.tex
--- a/talk/dls2014/paper/paper.tex
+++ b/talk/dls2014/paper/paper.tex
@@ -104,7 +104,7 @@
 \setlength{\pdfpageheight}{\paperheight}
 \setlength{\pdfpagewidth}{\paperwidth}
 
-\conferenceinfo{DLS 2014}{to be supplied}
+\conferenceinfo{Technical report}{to be supplied}
 \copyrightyear{2014}
 %\copyrightdata{978-1-nnnn-nnnn-n/yy/mm}
 \doi{nnnnnnn.nnnnnnn}
@@ -123,7 +123,6 @@
 %% \preprintfooter{short description of paper}   % 'preprint' option specified.
 
 \title{A Transactional Memory System for Parallel Python}
-%\subtitle{DLS'14}
 
 % \comment{
 % A Platform for Parallelism in Dynamic languages
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to