Skip to content
Snippets Groups Projects
Commit 2056c3c5 authored by LEGOLAS\lenz's avatar LEGOLAS\lenz
Browse files

Merge branch 'findOffsets' into feature/merging_with_VF_GPU 

# Conflicts:
#	src/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
#	targets/apps/HULC/main.cpp
parents 01717c34 53f59f96
Hide whitespace changes
Inline Side-by-side
Showing
with 592 additions and 89 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