Merge branch 'master' into sink_20190723
Conflicts: acc/mhd_solver/stencil_defines.h src/standalone/simulation.cc
This commit is contained in:
2
doc/manual/.gitignore
vendored
Normal file
2
doc/manual/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
*.html
|
||||
*.pdf
|
Reference in New Issue
Block a user