Commit c07292cd authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/Applications/15.08'

Conflicts:
	CMakeLists.txt
parents 67c6e53c 1cf6891f
Markdown is supported
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