preparing merge
32cb389eae45
Actions

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

Description

preparing merge

Committed

Christoph Schaefer <cerschae@greina0.cm.cluster>

Jul 18 2018, 15:38

Pushed

schaefer

Jul 18 2018, 15:38

Parents

R1448:ad2167a0115f: commit

Branches

Unknown

Tags

Unknown

References

readPara

Christoph Schaefer <cerschae@greina0.cm.cluster> committed R1448:32cb389eae45: preparing merge (authored by Christoph Schaefer <cerschae@greina0.cm.cluster>).Jul 18 2018, 15:38

				Path
	M			Benchmarks/ConfigFiles/90Pot81.par
	M			Benchmarks/ConfigFiles/m1931.par
	M			Benchmarks/GridGradient2Benchmark/Makefile.GPU
	P			Benchmarks/GridGradient2Benchmark/Makefile.intel Copied from Benchmarks/GridGradientBenchmarkMixed/Makefile.intel
	M			Benchmarks/GridGradient2Benchmark/main.cpp
	M			Benchmarks/GridGradientBenchmark/Makefile.intel
	M			Benchmarks/GridGradientBenchmark/MakefileFloat.GPU
	M			Benchmarks/GridGradientBenchmark/main.cpp
	M			Benchmarks/Scripts/GridGradient2Benchmark.sh
	M			Benchmarks/Scripts/GridGradientBenchmark.sh
	M			src/gradient2.cpp
	M			src/grid_gradient2_CPU.cpp
	M			src/grid_gradient_CPU.cpp