[pypy-commit] pypy vmprof-newstack: merge

2016-01-22 Thread fijal
Author: fijal Branch: vmprof-newstack Changeset: r81921:4b79f234a111 Date: 2016-01-22 17:45 +0100 http://bitbucket.org/pypy/pypy/changeset/4b79f234a111/ Log:merge diff --git a/rpython/jit/codewriter/test/test_jtransform.py b/rpython/jit/codewriter/test/test_jtransform.py --- a/rpython/jit/co

[pypy-commit] pypy vmprof-newstack: merge default

2016-01-07 Thread fijal
Author: fijal Branch: vmprof-newstack Changeset: r81615:58ef1d3f7f09 Date: 2016-01-08 09:52 +0200 http://bitbucket.org/pypy/pypy/changeset/58ef1d3f7f09/ Log:merge default diff too long, truncating to 2000 out of 34712 lines diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitigno