]> granicus.if.org Git - python/commit
Replay changeset 70238:03e488b5c009 from fubar branch. Original commit
authorBarry Warsaw <barry@python.org>
Mon, 23 May 2011 19:22:56 +0000 (15:22 -0400)
committerBarry Warsaw <barry@python.org>
Mon, 23 May 2011 19:22:56 +0000 (15:22 -0400)
commitcf0d8ab818852503057b8ade6cccc403fbb5d2be
tree8fcd89ece63691dade1d0c0f5c78f5b70eb84880
parente26bc109ffe4ca1c0cb73270d6f8662e6191cb40
Replay changeset 70238:03e488b5c009 from fubar branch.  Original commit
message:

Reconcile with the 2.6svn branch.  The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync.  These
changes should *not* propagate to any newer versions.
16 files changed:
Doc/README.txt
Doc/copyright.rst
Doc/library/configparser.rst
Doc/library/logging.rst
Doc/license.rst
Include/patchlevel.h
LICENSE
Lib/distutils/__init__.py
Lib/idlelib/idlever.py
Lib/pydoc_topics.py
Misc/NEWS
Misc/RPM/python-2.6.spec
PC/python_nt.rc
Python/Python-ast.c
Python/getcopyright.c
README