Skip to content
Snippets Groups Projects
Commit 858848a7 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'develop' into namespaces 

Conflicts:
	src/TNL/CMakeLists.txt
	src/TNL/Devices/Cuda.cpp
	src/TNL/Meshes/GridDetails/GridTraverser_impl.h
	src/TNL/Problems/HeatEquationProblem.h
	src/TNL/Solvers/ODE/ExplicitSolver.h
	src/TNL/TimerCPU.h
	src/TNL/TimerRT.h
parents 906adc3f f2042755
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 84 additions and 61 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment