Author: Hakan Ardo <[email protected]>
Branch: extradoc
Changeset: r3648:e2dc3a419c2a
Date: 2011-06-12 11:43 +0200
http://bitbucket.org/pypy/extradoc/changeset/e2dc3a419c2a/

Log:    hg merge

diff --git a/talk/icooolps2011/paper.tex b/talk/icooolps2011/paper.tex
--- a/talk/icooolps2011/paper.tex
+++ b/talk/icooolps2011/paper.tex
@@ -93,9 +93,9 @@
            {[email protected] \and [email protected] \and [email protected] \and
            [email protected] \and [email protected] \and 
[email protected]}
 
-\conferenceinfo{ICOOOLPS}{'11 Lancaster, UK}
+\conferenceinfo{ICOOOLPS'11,}{July 26, 2011, Lancaster, UK.}
 \CopyrightYear{2011}
-\crdata{XXX}
+\crdata{978-1-4503-0894-6/11/07}
 
 \maketitle
 
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to