Skip to content
Snippets Groups Projects
Select Git revision
No matching results
An error occurred while fetching branches. Retry the search.
An error occurred while fetching tags. Retry the search.
Blame Permalink
  • Tomáš Oberhuber's avatar
    dcec050e
    Merge branch 'master' into develop · dcec050e
    Tomáš Oberhuber authored 
    Conflicts:
	examples/advection/advection.h
	examples/advection/advectionRhs.h
	examples/inviscid-flow/2d/euler.h
	examples/inviscid-flow/2d/eulerRhs.h
	src/TNL/Functions/Analytic/SinBumps.h
	src/TNL/Functions/TestFunction.h
	src/TNL/Functions/TestFunction_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
	tests/benchmarks/heat-equation-benchmark/tnlTestGrid2D.h
    dcec050e
    History
    Merge branch 'master' into develop
    Tomáš Oberhuber authored 
    Conflicts:
	examples/advection/advection.h
	examples/advection/advectionRhs.h
	examples/inviscid-flow/2d/euler.h
	examples/inviscid-flow/2d/eulerRhs.h
	src/TNL/Functions/Analytic/SinBumps.h
	src/TNL/Functions/TestFunction.h
	src/TNL/Functions/TestFunction_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
	tests/benchmarks/heat-equation-benchmark/tnlTestGrid2D.h