Merge branch 'master' into mergepreparation
b1b6cae4a9fe
Actions

Authored by Christoph Schaefer <cerschae@greina0.cm.cluster> on Jul 18 2018, 15:41.

Description

Merge branch 'master' into mergepreparation

Committed

Christoph Schaefer <cerschae@greina0.cm.cluster>

Jul 18 2018, 15:41

Pushed

schaefer

Jul 19 2018, 11:17

Parents

Branches

Unknown

Tags

Unknown

Christoph Schaefer <cerschae@greina0.cm.cluster> committed R1448:b1b6cae4a9fe: Merge branch 'master' into mergepreparation (authored by Christoph Schaefer <cerschae@greina0.cm.cluster>).Jul 18 2018, 15:41

	Commit			Author	Details	Committed
	79da2bdcec30			fourestey	re-enabling OpenMP loop	Jul 3 2018
	88d938e8dc4c			fourestey	bug fix	Jul 3 2018

				Path
	M			Benchmarks/ChiBenchmark/main.cpp