Skip to content
Snippets Groups Projects
Commit 052dc2b1 authored by Markus Blatt's avatar Markus Blatt
Browse files

[Merge] merged recent changes from the trunk to prepare feature merge and adapted CMakeLists.txt 

[[Imported from SVN: r488]]
parent cbfdadff
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1317 additions and 1964 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