Skip to content
Snippets Groups Projects
Commit 16dddc14 authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge commit 'ae30e077258182c21ae4049b4810fc7faa57255d' 

* commit 'ae30e077258182c21ae4049b4810fc7faa57255d':
  Squashed 'cmake/' changes from b27f8064..baf6698e

Conflicts:
	cmake/CodeCoverage.cmake
parents 6157ccfe baf6698e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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