Merge branch 'master' into sink_20190723

Conflicts:
	acc/mhd_solver/stencil_defines.h
	src/standalone/simulation.cc
This commit is contained in:
JackHsu
2019-08-08 12:17:28 +08:00
21 changed files with 2034 additions and 1207 deletions

2
doc/manual/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
*.html
*.pdf