Skip to content
Snippets Groups Projects
Commit 7659f356 authored by James Almer's avatar James Almer
Browse files

Merge commit 'dad7a9c7' 


* commit 'dad7a9c7':
  configure: Rework dependency handling for conflicting components

Includes an important fix made by c546147d
as well.

Merged-by: default avatarJames Almer <jamrial@gmail.com>
parents f3aefb3e dad7a9c7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 15 additions and 10 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment