Author: Armin Rigo <[email protected]>
Branch: release-0.6
Changeset: r1238:598753c0dca2
Date: 2013-04-05 14:40 +0200
http://bitbucket.org/cffi/cffi/changeset/598753c0dca2/

Log:    hg merge default

diff --git a/doc/source/index.rst b/doc/source/index.rst
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -63,7 +63,7 @@
 left.
 
 It supports CPython 2.6; 2.7; 3.x (tested with 3.2 and 3.3);
-and PyPy 2.0 beta1 or later.
+and PyPy 2.0 beta2 or later.
 
 Its speed is comparable to ctypes on CPython (a bit faster but a higher
 warm-up time).  It is already faster on PyPy (1.5x-2x), but not yet
@@ -71,7 +71,7 @@
 
 Requirements:
 
-* CPython 2.6 or 2.7 or 3.x, or PyPy trunk
+* CPython 2.6 or 2.7 or 3.x, or PyPy 2.0 beta2
 
 * on CPython you need to build the C extension module, so you need
   ``python-dev`` and ``libffi-dev`` (for Windows, libffi is included
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to