Skip to content
Snippets Groups Projects
Commit 81508e19 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

MRG: get bugfixes from 'release-6.0' into develop

Conflicts:
	CMakeLists.txt
parents a86bb34b b8a0214e
No related branches found
No related tags found
Loading
Showing
with 36 additions and 48 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment