diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2015-10-21 13:38:36 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2015-10-21 13:38:36 (GMT) |
| commit | 4da71055e1aca0b9a047b5a3405cedf3c4c661f6 (patch) | |
| tree | c4d11e8dac22d8cfdb782c676cf5accb8f753dd3 /Misc | |
| parent | 9aba8c8a9552ae74b30b261b2eaa9a5720a2c27f (diff) | |
| download | cpython-4da71055e1aca0b9a047b5a3405cedf3c4c661f6.zip cpython-4da71055e1aca0b9a047b5a3405cedf3c4c661f6.tar.gz cpython-4da71055e1aca0b9a047b5a3405cedf3c4c661f6.tar.bz2 | |
Fix merge conflict artifacts and move the entry to correct place
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/NEWS | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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. |