[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r68750:c8c7be26e72f Date: 2014-01-17 22:47 +0100 http://bitbucket.org/pypy/pypy/changeset/c8c7be26e72f/ Log:hg merge default diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py ---

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r68695:e32ce09e64c1 Date: 2014-01-16 12:18 +0100 http://bitbucket.org/pypy/pypy/changeset/e32ce09e64c1/ Log:hg merge default diff --git a/pypy/doc/project-ideas.rst b/pypy/doc/project-ideas.rst --- a/pypy/doc/project-ideas.rst +++

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r68687:eb520c9ebbd8 Date: 2014-01-15 18:50 +0100 http://bitbucket.org/pypy/pypy/changeset/eb520c9ebbd8/ Log:hg merge default diff --git a/pypy/goal/getnightly.py b/pypy/goal/getnightly.py --- a/pypy/goal/getnightly.py +++

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r66716:fe46e12a3919 Date: 2013-08-31 13:54 +0100 http://bitbucket.org/pypy/pypy/changeset/fe46e12a3919/ Log:hg merge default diff --git a/lib-python/2.7/uuid.py b/lib-python/2.7/uuid.py --- a/lib-python/2.7/uuid.py +++

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r66679:a8ceea5620aa Date: 2013-08-30 16:07 +0100 http://bitbucket.org/pypy/pypy/changeset/a8ceea5620aa/ Log:hg merge default diff --git a/lib-python/2.7/uuid.py b/lib-python/2.7/uuid.py --- a/lib-python/2.7/uuid.py +++

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r66273:13bf2a4c394b Date: 2013-08-21 03:08 +0200 http://bitbucket.org/pypy/pypy/changeset/13bf2a4c394b/ Log:hg merge default diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst --- a/pypy/doc/coding-guide.rst +++

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r66184:ee8c9667c732 Date: 2013-08-17 17:05 +0200 http://bitbucket.org/pypy/pypy/changeset/ee8c9667c732/ Log:hg merge default diff --git a/pypy/doc/cppyy.rst b/pypy/doc/cppyy.rst --- a/pypy/doc/cppyy.rst +++ b/pypy/doc/cppyy.rst @@

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r65866:a8ec1d207404 Date: 2013-07-31 22:19 +0200 http://bitbucket.org/pypy/pypy/changeset/a8ec1d207404/ Log:hg merge default diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py --- a/lib_pypy/_curses.py +++ b/lib_pypy/_curses.py

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r65607:c844d22e5405 Date: 2013-07-24 15:54 +0200 http://bitbucket.org/pypy/pypy/changeset/c844d22e5405/ Log:hg merge default diff --git a/lib-python/2.7/test/test_os.py b/lib-python/2.7/test/test_os.py ---

[pypy-commit] pypy refactor-str-types: hg merge default

Author: Manuel Jacob Branch: refactor-str-types Changeset: r64924:92862dc40ad6 Date: 2013-06-17 17:57 +0200 http://bitbucket.org/pypy/pypy/changeset/92862dc40ad6/ Log:hg merge default diff --git a/pypy/tool/pytest/appsupport.py b/pypy/tool/pytest/appsupport.py ---

[pypy-commit] pypy refactor-str-types: hg merge default (Solve merge conflicts by discarding remote changes.)

Author: Manuel Jacob Branch: refactor-str-types Changeset: r64921:9d28dbdb46be Date: 2013-06-17 16:18 +0200 http://bitbucket.org/pypy/pypy/changeset/9d28dbdb46be/ Log:hg merge default (Solve merge conflicts by discarding remote changes.) diff --git a/pypy/interpreter/baseobjspace.py