Commits

Armin Rigo  committed ad65bcf Merge

merge release-2.0-beta2 back into "default", to get the updated version number

  • Participants
  • Parent commits 7fdab13, 61273f6

Comments (0)

Files changed (14)

File pypy/doc/whatsnew-2.0.0-beta1.rst

File contents unchanged.

File pypy/module/_minimal_curses/__init__.py

File contents unchanged.

File pypy/module/_minimal_curses/fficurses.py

File contents unchanged.

File pypy/module/_minimal_curses/interp_curses.py

File contents unchanged.

File pypy/module/_minimal_curses/test/test_curses.py

File contents unchanged.

File pypy/module/cpyext/include/patchlevel.h

 #define PY_VERSION		"2.7.3"
 
 /* PyPy version as a string */
-#define PYPY_VERSION "2.0.0-beta1"
+#define PYPY_VERSION "2.0.0-beta2"
 
 /* Subversion Revision number of this file (not of the repository).
  * Empty since Mercurial migration. */

File pypy/module/sys/version.py

 #XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
 CPYTHON_API_VERSION        = 1013   #XXX # sync with include/modsupport.h
 
-PYPY_VERSION               = (2, 0, 0, "beta", 1)    #XXX # sync patchlevel.h
+PYPY_VERSION               = (2, 0, 0, "beta", 2)    #XXX # sync patchlevel.h
 
 if platform.name == 'msvc':
     COMPILER_INFO = 'MSC v.%d 32 bit' % (platform.version * 10 + 600)

File rpython/jit/backend/arm/arch.py

File contents unchanged.

File rpython/jit/backend/arm/codebuilder.py

File contents unchanged.

File rpython/jit/backend/arm/opassembler.py

File contents unchanged.

File rpython/jit/backend/arm/regalloc.py

File contents unchanged.

File rpython/jit/backend/arm/runner.py

File contents unchanged.

File rpython/jit/backend/arm/test/test_float.py

File contents unchanged.

File rpython/translator/platform/darwin.py

File contents unchanged.