Merge pull request #5874 from davydden/feature/project_with_block

author Denis Davydov <davydden@gmail.com>

Thu, 8 Feb 2018 11:53:56 +0000 (12:53 +0100)

committer GitHub <noreply@github.com>

Thu, 8 Feb 2018 11:53:56 +0000 (12:53 +0100)
author Denis Davydov <davydden@gmail.com>
Thu, 8 Feb 2018 11:53:56 +0000 (12:53 +0100)
committer GitHub <noreply@github.com>
Thu, 8 Feb 2018 11:53:56 +0000 (12:53 +0100)
diff --cc include/deal.II/numerics/vector_tools.h
Simple merge
diff --cc include/deal.II/numerics/vector_tools.templates.h
Simple merge
diff --cc tests/numerics/project_parallel_qpmf_common.h
Simple merge
author	Denis Davydov <davydden@gmail.com>
	Thu, 8 Feb 2018 11:53:56 +0000 (12:53 +0100)
committer	GitHub <noreply@github.com>
	Thu, 8 Feb 2018 11:53:56 +0000 (12:53 +0100)
		1	2
include/deal.II/numerics/vector_tools.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/numerics/vector_tools.templates.h	patch \|	diff1 \|	diff2 \|	blob \| history
tests/numerics/project_parallel_qpmf_common.h	patch \|	diff1 \|	diff2 \|	blob \| history