Skip to content
Snippets Groups Projects
Commit 59a51961 authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Merge branch 'master' of apps.jcns.fz-juelich.de:GISASFW 

Conflicts:
	Core/Samples/inc/ISample.h
	Core/Samples/inc/Layer.h
parents 5ceb2ab8 ad031778
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 498 additions and 42 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