diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 15:55:03 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 15:55:03 (GMT) |
| commit | 2273ab2a0df96b96b7a5794537ca78a13129e3c4 (patch) | |
| tree | bff538e4d7017e41e613d90f56aa89094978a207 /Misc | |
| parent | 617c4dc30427041984a21b3ca3873a585ca2cb1a (diff) | |
| parent | a3818a304327d31b4360dc9b545f2655d27c626e (diff) | |
| download | cpython-2273ab2a0df96b96b7a5794537ca78a13129e3c4.zip cpython-2273ab2a0df96b96b7a5794537ca78a13129e3c4.tar.gz cpython-2273ab2a0df96b96b7a5794537ca78a13129e3c4.tar.bz2 | |
Merge 3.4
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/NEWS | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -244,8 +244,14 @@ 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 #20644: OS X installer build support for documentation build changes in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin. |