diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 16:46:53 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 16:46:53 (GMT) |
| commit | 72f61de768dc17ad528e1b3c01a87998eff22cac (patch) | |
| tree | 14714ddf39589ce23245cd394e889c3a54c9d14e /Misc/NEWS | |
| parent | 2273ab2a0df96b96b7a5794537ca78a13129e3c4 (diff) | |
| download | cpython-72f61de768dc17ad528e1b3c01a87998eff22cac.zip cpython-72f61de768dc17ad528e1b3c01a87998eff22cac.tar.gz cpython-72f61de768dc17ad528e1b3c01a87998eff22cac.tar.bz2 | |
- fix merge conflict
Diffstat (limited to 'Misc/NEWS')
| -rw-r--r-- | Misc/NEWS | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -244,14 +244,12 @@ IDLE 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 include directories if they aren't already being searched. This avoids 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 in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin. |