[pypy-commit] cffi default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r452:7ecde53f8a01
Date: 2012-06-18 13:56 +0200
http://bitbucket.org/cffi/cffi/changeset/7ecde53f8a01/

Log:	merge

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,11 +1,1 @@
-48c2b9f912dbb1932f40c6fdfa495c3d605dc79d release-0.1
-48c2b9f912dbb1932f40c6fdfa495c3d605dc79d release-0.1
-b1b3a110db1e6e0fe661242c045420758ca36825 release-0.1
-b1b3a110db1e6e0fe661242c045420758ca36825 release-0.1
-ecb400ac82cdf99168d6fab598c75888a3b9cdad release-0.1
-ecb400ac82cdf99168d6fab598c75888a3b9cdad release-0.1
-d4e3b3e1dcd131419e8cd94ca455043c8849d829 release-0.1
-d4e3b3e1dcd131419e8cd94ca455043c8849d829 release-0.1
-ea23f549e52ac745dbb24ccfa090813b02e3beb9 release-0.1
-ea23f549e52ac745dbb24ccfa090813b02e3beb9 release-0.1
 bc70157493bff1996fd2fb0c7f15356a50bd2f73 release-0.1
diff --git a/doc/source/index.rst b/doc/source/index.rst
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -21,7 +21,7 @@
   or the API (Application Programming Interface).  Usually, C
   libraries have a specified C API but often not an ABI (e.g. they may
   document a "struct" as having at least these fields, but maybe more).
-  (ctypes_ works at the ABI level, whereas `native C extensions`_
+  (ctypes_ works at the ABI level, whereas Cython_ and `native C extensions`_
   work at the API level.)
 
 * We try to be complete.  For now some C99 constructs are not supported,