Merge pull request #8115 from tjhei/doxygen_fixes3

author Matthias Maier <tamiko@43-1.org>

Sun, 12 May 2019 21:49:36 +0000 (16:49 -0500)

committer GitHub <noreply@github.com>

Sun, 12 May 2019 21:49:36 +0000 (16:49 -0500)
author Matthias Maier <tamiko@43-1.org>
Sun, 12 May 2019 21:49:36 +0000 (16:49 -0500)
committer GitHub <noreply@github.com>
Sun, 12 May 2019 21:49:36 +0000 (16:49 -0500)
diff --cc examples/step-49/step-49.cc
Simple merge
diff --cc include/deal.II/differentiation/sd/symengine_scalar_operations.h
Simple merge
diff --cc include/deal.II/meshworker/scratch_data.h
Simple merge
author	Matthias Maier <tamiko@43-1.org>
	Sun, 12 May 2019 21:49:36 +0000 (16:49 -0500)
committer	GitHub <noreply@github.com>
	Sun, 12 May 2019 21:49:36 +0000 (16:49 -0500)
		1	2
examples/step-49/step-49.cc	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/differentiation/sd/symengine_scalar_operations.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/meshworker/scratch_data.h	patch \|	diff1 \|	diff2 \|	blob \| history