Author: mattip <matti.pi...@gmail.com>
Branch: release-5.x
Changeset: r83772:3260adbeba4a
Date: 2016-04-19 16:22 +0300
http://bitbucket.org/pypy/pypy/changeset/3260adbeba4a/
Log: fix merge
diff --git a/pypy/module/cpyext/include/patchlevel.h
b/pypy/module/cpyext/include/patchlevel.h
--- a/pypy/module/cpyext/include/patchlevel.h
+++ b/pypy/module/cpyext/include/patchlevel.h
@@ -30,7 +30,7 @@
/* PyPy version as a string */
#define PYPY_VERSION "5.1.0"
-#define PYPY_VERSION_NUM 0x05020000
+#define PYPY_VERSION_NUM 0x05010000
/* Defined to mean a PyPy where cpyext holds more regular references
to PyObjects, e.g. staying alive as long as the internal PyPy object
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
