Skip to content

C
cpython
Kaydet (Commit) 4da71055 authored tarafından Berker Peksag's avatar Berker Peksag
Dosyalara gözat
Seçenekler

Fix merge conflict artifacts and move the entry to correct place

üst 9aba8c8a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
Misc/NEWS
Dosyayı görüntüle @ 4da71055
...@@ -366,6 +366,12 @@ Windows ...@@ -366,6 +366,12 @@ Windows
- Issue #25022: Removed very outdated PC/example_nt/ directory. - 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? What's New in Python 3.5.0 final?
================================= =================================
...@@ -1045,17 +1051,12 @@ Documentation ...@@ -1045,17 +1051,12 @@ Documentation
Tools/Demos Tools/Demos
----------- -----------
<<<<<<< local
- Issue #24000: Improved Argument Clinic's mapping of converters to legacy - Issue #24000: Improved Argument Clinic's mapping of converters to legacy
"format units". Updated the documentation to match. "format units". Updated the documentation to match.
- Issue #24001: Argument Clinic converters now use accept={type} - Issue #24001: Argument Clinic converters now use accept={type}
instead of types={'type'} to specify the types the converter accepts. 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 #23330: h2py now supports arbitrary filenames in #include.
- Issue #24031: make patchcheck now supports git checkouts, too. - Issue #24031: make patchcheck now supports git checkouts, too.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment