Skip to content
Snippets Groups Projects
Commit 89c144a6 authored by Markus Frank's avatar Markus Frank
Browse files

Merge branch 'gaede-fix_coverity' 

Fix collisions in merge with changes from Frank.
parents a8e34d78 b91f0b69
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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