Skip to content
Snippets Groups Projects
Commit 41fd68dd authored by Floris Berendsen's avatar Floris Berendsen Committed by FBerendsen
Browse files

Merge branch 'develop' into ELASTIX-44-Unite-Interface-framework-with-Factory-framework 

Conflicts:
	Modules/Core/ModuleCore.cmake

TODO: fix VNL gcc flags and run tests
parents 4c52d5f3 3f44bc3a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 643 additions and 75 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