On Thu, Apr 17, 2014, at 8:55, matthias.klose wrote: > http://hg.python.org/cpython/rev/1d1aefd00f07 > changeset: 90382:1d1aefd00f07 > parent: 90380:517de1983677 > parent: 90381:1a00e04a233d > user: d...@ubuntu.com > date: Thu Apr 17 17:55:03 2014 +0200 > summary: > Merge 3.4 > > files: > Misc/NEWS | 6 ++++++ > setup.py | 15 +++++++++++++-- > 2 files changed, 19 insertions(+), 2 deletions(-) > > > diff --git a/Misc/NEWS b/Misc/NEWS > --- a/Misc/NEWS > +++ b/Misc/NEWS > @@ -244,8 +244,14 @@ > 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
You might want to actually resolve this conflict. _______________________________________________ Python-Dev mailing list Python-Dev@python.org https://mail.python.org/mailman/listinfo/python-dev Unsubscribe: https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
