Skip to content
Snippets Groups Projects
Commit 4c52d5f3 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

Merge branch 'ELASTIX-44-Unite-Interface-framework-with-Factory-framework' of... 

Merge branch 'ELASTIX-44-Unite-Interface-framework-with-Factory-framework' of https://github.com/kaspermarstal/SuperElastix into ELASTIX-44-Unite-Interface-framework-with-Factory-framework

Conflicts:
	Modules/Core/ComponentInterface/include/ComponentBase.h
	Modules/Core/ExampleComponents/src/GDOptimizer3rdPartyComponent.cxx
	Modules/Core/ExampleComponents/src/SSDMetric3rdPartyComponent.cxx
parents 8e13dac4 0d7ef42d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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