Skip to content
Commit dfdaafc2 authored by Paul Heinzlreiter's avatar Paul Heinzlreiter
Browse files

Merge branch 'master' into 'master' 

# Conflicts:
#   hpc_kernel_samples/n-body_methods/CMakeLists.txt
parents 54b36c2c 190c8508
Hide whitespace changes
Inline Side-by-side
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