Merge pull request #8319 from kronbichler/step-67

author Wolfgang Bangerth <bangerth@colostate.edu>

Sat, 28 Mar 2020 21:16:10 +0000 (22:16 +0100)

committer GitHub <noreply@github.com>

Sat, 28 Mar 2020 21:16:10 +0000 (22:16 +0100)
author Wolfgang Bangerth <bangerth@colostate.edu>
Sat, 28 Mar 2020 21:16:10 +0000 (22:16 +0100)
committer GitHub <noreply@github.com>
Sat, 28 Mar 2020 21:16:10 +0000 (22:16 +0100)
diff --cc doc/doxygen/headers/matrixfree.h
Simple merge
diff --cc doc/doxygen/tutorial/tutorial.h.in
Simple merge
diff --cc examples/step-69/step-69.cc
Simple merge
author	Wolfgang Bangerth <bangerth@colostate.edu>
	Sat, 28 Mar 2020 21:16:10 +0000 (22:16 +0100)
committer	GitHub <noreply@github.com>
	Sat, 28 Mar 2020 21:16:10 +0000 (22:16 +0100)
		1	2
doc/doxygen/headers/matrixfree.h	patch \|	diff1 \|	diff2 \|	blob \| history
doc/doxygen/tutorial/tutorial.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
examples/step-69/step-69.cc	patch \|	diff1 \|	diff2 \|	blob \| history