Skip to content
Snippets Groups Projects
Commit bda5892b 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: r1911]]
parents f81692c4 14411c28 2c5baa0b 57a0e068
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1200 additions and 286 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