resolved merge
f41fbe45c73f
Actions

Authored by Christoph Schaefer <cerschae@greina17.cm.cluster> on Feb 23 2017, 16:07.

Description

resolved merge

Committed

Christoph Schaefer <cerschae@greina17.cm.cluster>

Feb 23 2017, 16:07

Pushed

schaefer

Feb 23 2017, 16:08

Parents

Branches

Unknown

Tags

Unknown

Christoph Schaefer <cerschae@greina17.cm.cluster> committed R1448:f41fbe45c73f: resolved merge (authored by Christoph Schaefer <cerschae@greina17.cm.cluster>).Feb 23 2017, 16:07

	Commit			Author	Details	Committed
	730c79dea1a8			schaefer	starting GPU	Jan 30 2017

				Path
	P			Benchmarks/ChiBenchmark/cudafunctions.cu Copied from Benchmarks/GridGradientBenchmark/cudafunctions.cu
	P			Benchmarks/ChiBenchmark/cudafunctions.cuh Copied from Benchmarks/GridGradientBenchmark/cudafunctions.cuh
	M			Benchmarks/ChiBenchmark/main.cpp
	M			Benchmarks/ConfigFiles/90Pot.par