diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-10-06 17:20:09 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-10-06 17:20:09 -0700 |
commit | 94fc9aa76ba458798b7405f4ce8813a49046380e (patch) | |
tree | d1109b5763adb64e35741493b2733c904b17c72b /make.conf-repatch.sh | |
parent | ada0dbfd43d896dd09570261aa5c62a2cb0021c0 (diff) | |
download | portage-94fc9aa76ba458798b7405f4ce8813a49046380e.tar.gz portage-94fc9aa76ba458798b7405f4ce8813a49046380e.tar.bz2 portage-94fc9aa76ba458798b7405f4ce8813a49046380e.zip |
Merge slot conflict backtracking from master.
This include the ability to mask packages that don't satisfy all
parent atoms, from commit 9ff5e9731142d389373ea6ebc949919c3b637110.
Diffstat (limited to 'make.conf-repatch.sh')
0 files changed, 0 insertions, 0 deletions