Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix merge conflict artifacts and move the entry to correct place

This commit is contained in:
Berker Peksag 2015-10-21 16:38:36 +03:00
parent 9aba8c8a95
commit 4da71055e1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Misc/NEWS
View File

@ -366,6 +366,12 @@ Windows
- Issue #25022: Removed very outdated PC/example_nt/ directory.
Tools/Demos
-----------
- Issue #25440: Fix output of python-config --extension-suffix.
What's New in Python 3.5.0 final?
=================================
@ -1045,17 +1051,12 @@ Documentation
Tools/Demos
-----------
<<<<<<< local
- Issue #24000: Improved Argument Clinic's mapping of converters to legacy
"format units". Updated the documentation to match.
- Issue #24001: Argument Clinic converters now use accept={type}
instead of types={'type'} to specify the types the converter accepts.
=======
- Issue #25440: Fix output of python-config --extension-suffix.
>>>>>>> other
- Issue #23330: h2py now supports arbitrary filenames in #include.
- Issue #24031: make patchcheck now supports git checkouts, too.