Commit 9233720a authored by Andreas Marek's avatar Andreas Marek
Browse files

Merge branch 'fix_omp' into 'master_pre_stage'

Fix omp

See merge request !12
parents 57c4bada e867741a