Conflicts:
	examples/advection/advectionProblem.h
	examples/heat-equation/tnl-heat-equation.h
	examples/inviscid-flow/1d/eulerProblem.h
	examples/inviscid-flow/2d/eulerProblem.h
	src/TNL/Containers/Array_impl.h
	src/TNL/Devices/CudaDeviceInfo.cpp
	src/TNL/Devices/CudaDeviceInfo.cu
	src/TNL/Devices/CudaDeviceInfo.h
	src/TNL/File.h
	src/TNL/Functions/Analytic/SinBumps.h
	src/TNL/Functions/Analytic/SinBumps_impl.h
	src/TNL/Functions/Analytic/SinWave.h
	src/TNL/Functions/MeshFunctionVTKWriter_impl.h
	src/TNL/Functions/TestFunction_impl.h
	src/TNL/Images/PGMImage_impl.h
	src/TNL/Matrices/Dense_impl.h
	src/TNL/Meshes/GridDetails/Grid1D.h
	src/TNL/Meshes/GridDetails/Grid1D_impl.h
	src/TNL/Meshes/GridDetails/Grid2D.h
	src/TNL/Meshes/GridDetails/Grid2D_impl.h
	src/TNL/Meshes/GridDetails/Grid3D.h
	src/TNL/Meshes/GridDetails/Grid3D_impl.h
	src/TNL/Operators/CMakeLists.txt
	src/TNL/Operators/NeumannBoundaryConditions.h
	src/TNL/Problems/MeanCurvatureFlowProblem.h
	src/TNL/Solvers/ODE/Euler_impl.h
	src/TNL/Solvers/ODE/ExplicitSolver_impl.h
	src/TNL/Solvers/ODE/Merson_impl.h
	src/TNL/Solvers/PDE/PDESolver.h
	src/TNL/Solvers/PDE/PDESolver_impl.h
	src/Tools/tnl-view.cpp
	src/core/CMakeLists.txt
	src/core/arrays/tnlMultiArray1D_impl.h
	src/core/terminal-colors.h
	src/core/tnlLogger.cpp
	src/core/tnlTimerCPU.cpp
	src/core/tnlTimerRT.cpp
	src/core/vectors/tnlMultiVector3D_impl.h
	src/core/vectors/tnlMultiVector4D_impl.h
	src/functions/CMakeLists.txt
	src/functions/tnlMeshFunction_impl.h
	src/functions/tnlSinWaveFunction_impl.h
	src/mesh/grids/tnlTraverser_Grid1D.h
	src/problems/tnlHeatEquationProblem.h
	src/problems/tnlPDEProblem.h
	src/problems/tnlPDEProblem_impl.h
	src/solvers/linear/stationary/tnlSORSolver_impl.h
	src/solvers/ode/tnlExplicitSolver.h
	src/solvers/ode/tnlODESolverMonitor.h
	src/solvers/ode/tnlODESolverMonitor_impl.h
	src/solvers/pde/CMakeLists.txt
	src/solvers/pde/tnlExplicitTimeStepper.h
	src/solvers/pde/tnlPDESolver.h
	src/solvers/pde/tnlPDESolver_impl.h
	src/solvers/pde/tnlTimeDependentPDESolver.h
	src/solvers/pde/tnlTimeDependentPDESolver_impl.h
	src/solvers/tnlBuildConfigTags.h
	src/solvers/tnlSolverConfig_impl.h
	src/solvers/tnlSolverStarter.h
	src/solvers/tnlSolverStarter_impl.h
	tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem.h
	tools/src/tnl-view.h