[pypy-commit] pypy default: Document traceviewer-common-merge-point-formats branch

[krono]

Author: Tobias Pape <tobias at netshed.de>
Branch: 
Changeset: r84834:7d3090361734
Date: 2016-05-30 13:30 +0200
http://bitbucket.org/pypy/pypy/changeset/7d3090361734/

Log:	Document traceviewer-common-merge-point-formats branch

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -122,3 +122,7 @@
 
 Move _numpypy headers into a directory so they are not picked up by upstream numpy, scipy
 This allows building upstream numpy and scipy in pypy via cpyext
+
+.. branch: traceviewer-common-merge-point-formats
+
+Teach RPython JIT's off-line traceviewer the most common ``debug_merge_point`` formats.
\ No newline at end of file