[pypy-commit] pypy remove-dict-smm: hg merge default

2013-05-17 Thread Manuel Jacob
Author: Manuel Jacob Branch: remove-dict-smm Changeset: r64250:73e4f8cf4839 Date: 2013-05-17 11:25 +0200 http://bitbucket.org/pypy/pypy/changeset/73e4f8cf4839/ Log:hg merge default diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py --- a/pypy/doc/conf.py +++ b/pypy/doc/conf.py @@ -47,7 +47,7 @@

[pypy-commit] pypy remove-dict-smm: hg merge default

2013-05-16 Thread Manuel Jacob
Author: Manuel Jacob Branch: remove-dict-smm Changeset: r64225:c2456e885d8c Date: 2013-05-16 13:51 +0200 http://bitbucket.org/pypy/pypy/changeset/c2456e885d8c/ Log:hg merge default diff --git a/lib-python/2.7/socket.py b/lib-python/2.7/socket.py --- a/lib-python/2.7/socket.py +++ b/lib-python

[pypy-commit] pypy remove-dict-smm: hg merge default

2013-05-14 Thread Manuel Jacob
Author: Manuel Jacob Branch: remove-dict-smm Changeset: r64107:7bc9f833a790 Date: 2013-05-14 23:40 +0200 http://bitbucket.org/pypy/pypy/changeset/7bc9f833a790/ Log:hg merge default diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py --- a/pypy/config/pypyoption.py +++ b/pypy/co