Skip to content
Commit 8fc0b0a1 authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Merge branch 'develop' into MIC-devel

Conflicts:
	CMakeLists.txt
	build
	src/TNL/Assert.h
	src/TNL/Containers/SharedArray.h
	src/TNL/Containers/StaticVector.h
	src/TNL/Containers/StaticVector1D_impl.h
	src/TNL/DevicePointer.h
	src/TNL/Devices/Cuda.h
	src/TNL/Operators/diffusion/LinearDiffusion_impl.h
	src/TNL/Problems/HeatEquationProblem_impl.h
	src/TNL/SharedPointer.h
	src/TNL/Solvers/PDE/ExplicitUpdater.h
	src/TNL/Solvers/SolverMonitor.h
	src/TNL/UniquePointer.h
parents c2ab30c3 323dd294
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment