[pypy-commit] pypy default: document merge branches

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r92909:8ee02499c7fd
Date: 2017-11-02 17:08 +0200
http://bitbucket.org/pypy/pypy/changeset/8ee02499c7fd/

Log:	document merge 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
@@ -10,3 +10,10 @@
 
 .. branch: docs-osx-brew-openssl
 
+.. branch: keep-debug-symbols
+Add a smartstrip tool, which can optionally keep the debug symbols in a
+separate file, instead of just stripping them away. Use it in packaging
+
+.. branch: bsd-patches
+Fix failures on FreeBSD, contributed by David Naylor as patches on the issue
+tracker (issues 2694, 2695, 2696, 2697)