Skip to content
Commit 0805d41c authored by Sebastian Gottfried's avatar Sebastian Gottfried
Browse files

Merge Branch 'Applications/16.12' 

# Conflicts:
#	CMakeLists.txt
parents d7a28121 816c550b
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