commit:     1b9d59c47031a25e8105196ae944615e0b5a0a6a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 07:31:54 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 07:31:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=1b9d59c4

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

 RELEASE-NOTES                                      | 14 ++++
 bin/postinst-qa-check.d/50gnome2-utils             |  2 +
 bin/postinst-qa-check.d/50xdg-utils                |  8 +-
 pym/_emerge/depgraph.py                            | 38 ++++++++--
 pym/_emerge/search.py                              |  8 +-
 .../resolver/test_autounmask_use_backtrack.py      | 86 ++++++++++++++++++++++
 .../tests/resolver/test_slot_conflict_update.py    |  2 +-
 setup.py                                           |  2 +-
 8 files changed, 150 insertions(+), 10 deletions(-)

Reply via email to