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

MRG: synchronize with branch 'develop', into bugfix-1278

Conflicts:
	Modules/Visualization/MonteverdiGui/include/mvdImageViewRenderer.h
parents 1c7d86c4 32f11b04
No related branches found
No related tags found
No related merge requests found
Showing
with 177 additions and 106 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