Author: Hakan Ardo <ha...@debian.org> 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 @@ {cfb...@gmx.de \and anto.c...@gmail.com \and fi...@merlinux.eu \and leusc...@cs.uni-duesseldorf.de \and samuele.pedr...@gmail.com \and ar...@tunes.org} -\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 pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit