mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

- fix merge conflict

Browse source
This commit is contained in:
doko@ubuntu.com 2014-04-17 18:46:53 +02:00
parent 2273ab2a0d
commit 72f61de768
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Misc/NEWS
View file

@ -244,14 +244,12 @@ IDLE
Build Build
----- -----
<<<<<<< local
- Issue #17861: Tools/scripts/generate_opcode_h.py automatically regenerates
Include/opcode.h from Lib/opcode.py if the later gets any change.
=======
- Issue #15234: For BerkelyDB and Sqlite, only add the found library and - Issue #15234: For BerkelyDB and Sqlite, only add the found library and
include directories if they aren't already being searched. This avoids include directories if they aren't already being searched. This avoids
an explicit runtime library dependency. an explicit runtime library dependency.
>>>>>>> other
- Issue #17861: Tools/scripts/generate_opcode_h.py automatically regenerates
Include/opcode.h from Lib/opcode.py if the later gets any change.
- Issue #20644: OS X installer build support for documentation build changes - Issue #20644: OS X installer build support for documentation build changes
in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin. in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin.