Skip to content
Commit b6565f5b authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'config' into diffusion

Conflicts:
	.gitignore
	examples/CMakeLists.txt
	examples/heat-equation/CMakeLists.txt
	examples/simple-solver/CMakeLists.txt
	examples/simple-solver/simple-solver.cfg.desc
	examples/simple-solver/simpleProblemSetter_impl.h
	src/implementation/mesh/tnlGrid3D_impl.h
parents 893ff293 11b954ec
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