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

Merge branches 'ELASTIX-24-Component-Interface-Handshake' and 

'ELASTIX-12-implement-componentdatabase' into develop

Conflicts:
	Modules/Core/elxModuleCore.cmake
	Testing/Unit/CMakeLists.txt
parents 393060f9 a961c042
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 638 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