Commit 80f8f355 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'cuda-optimizations' of... 

Merge branch 'cuda-optimizations' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into cuda-optimizations

Conflicts:
	tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem_impl.h
parents 287dcab1 452dcef9
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment