[pypy-commit] pypy default: document merged branches

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r91428:cf5a42dd00cb
Date: 2017-05-28 17:33 +0300
http://bitbucket.org/pypy/pypy/changeset/cf5a42dd00cb/

Log:	document merged branches

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
@@ -68,3 +68,10 @@
 or gc_store_indexed whenever possible. Moreover, enable the existing
 struct.unpack fast path to all the existing buffer types, whereas previously
 it was enabled only for strings
+
+.. branch: Kounavi/fix-typo-depricate-to-deprecate-p-1495624547235
+
+.. branch: PyPy_profopt_enabled
+
+Add profile-based optimization option ``profopt``, and specify training data
+via ``profoptpath``