Skip to content
Snippets Groups Projects
Commit afb5b1d7 authored by Victor Poughon's avatar Victor Poughon
Browse files

Merge branch 'develop' into widget_parents

Conflicts:
	Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetBoolParameter.h
parents 2aa793fb 9bdec1f7
No related branches found
No related tags found
Loading
Showing
with 179 additions and 36 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