[pypy-commit] pypy distutils-cppldflags: merge default

[liquibits]

Author: Pawe? Piotr Przeradowski <showerproof86 at gmail.com>
Branch: distutils-cppldflags
Changeset: r65380:0d25b03e335c
Date: 2013-07-14 17:38 +0200
http://bitbucket.org/pypy/pypy/changeset/0d25b03e335c/

Log:	merge default

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
@@ -16,3 +16,7 @@
 .. branch: flowoperators
 Simplify rpython/flowspace/ code by using more metaprogramming.  Create
 SpaceOperator class to gather static information about flow graph operations.
+
+.. branch: package-tk
+Adapt package.py script to compile CFFI tk extension. Add a --without-tk switch
+to optionally skip it.