Commit 86571ca6 authored by Matti Picus's avatar Matti Picus
Browse files

start 2.6.1 release cycle

--HG--
branch : release-2.6.x
parent d72d3d9ffb97
......@@ -168,7 +168,6 @@ copyrighted by one or more of the following people and organizations:
Michael Twomey
Lucian Branescu Mihaila
Yichao Yu
Anton Gulenko
Gabriel Lavoie
Olivier Dormond
Jared Grubb
......@@ -215,6 +214,7 @@ copyrighted by one or more of the following people and organizations:
Carl Meyer
Karl Ramm
Pieter Zieschang
Anton Gulenko
Gabriel
Lukas Vacek
Andrew Dalke
......@@ -247,6 +247,7 @@ copyrighted by one or more of the following people and organizations:
Toni Mattis
Lucas Stadler
Julian Berman
Markus Holtermann
roberto@goyle
Yury V. Zaytsev
Anna Katrina Dominguez
......
......@@ -32,6 +32,7 @@ appropriate measure but it's something)::
Lukas Diekmann
Sven Hager
Anders Lehmann
Richard Plangger
Aurelien Campeas
Remi Meier
Niklaus Haldimann
......@@ -57,7 +58,6 @@ appropriate measure but it's something)::
Ludovic Aubry
Jacob Hallen
Jason Creighton
Richard Plangger
Alex Martelli
Michal Bendowski
stian
......@@ -138,7 +138,6 @@ appropriate measure but it's something)::
Michael Twomey
Lucian Branescu Mihaila
Yichao Yu
Anton Gulenko
Gabriel Lavoie
Olivier Dormond
Jared Grubb
......@@ -185,6 +184,7 @@ appropriate measure but it's something)::
Carl Meyer
Karl Ramm
Pieter Zieschang
Anton Gulenko
Gabriel
Lukas Vacek
Andrew Dalke
......@@ -217,6 +217,7 @@ appropriate measure but it's something)::
Toni Mattis
Lucas Stadler
Julian Berman
Markus Holtermann
roberto@goyle
Yury V. Zaytsev
Anna Katrina Dominguez
......@@ -252,6 +253,7 @@ appropriate measure but it's something)::
shoma hosaka
Daniel Neuhäuser
Ben Mather
Niclas Olofsson
halgari
Boglarka Vezer
Chris Pressey
......
......@@ -29,7 +29,7 @@
#define PY_VERSION "2.7.10"
/* PyPy version as a string */
#define PYPY_VERSION "2.7.0-alpha0"
#define PYPY_VERSION "2.6.1"
/* Subversion Revision number of this file (not of the repository).
* Empty since Mercurial migration. */
......
......@@ -10,7 +10,7 @@ CPYTHON_VERSION = (2, 7, 10, "final", 42)
#XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
CPYTHON_API_VERSION = 1013 #XXX # sync with include/modsupport.h
PYPY_VERSION = (2, 7, 0, "alpha", 0) #XXX # sync patchlevel.h
PYPY_VERSION = (2, 6, 1, "final", 0) #XXX # sync patchlevel.h
import pypy
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment