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

MRG: Synchronize with branch develop 

Conflicts:
	Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
parents 1374c06b 01181350
No related branches found
No related tags found
1 merge request!3Qt4to5
Hide whitespace changes
Inline Side-by-side
Showing
with 642 additions and 54 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