Merge pull request #6331 from tjhei/update_copyright

author David Wells <drwells@vt.edu>

Thu, 26 Apr 2018 01:55:28 +0000 (21:55 -0400)

committer GitHub <noreply@github.com>

Thu, 26 Apr 2018 01:55:28 +0000 (21:55 -0400)
author David Wells <drwells@vt.edu>
Thu, 26 Apr 2018 01:55:28 +0000 (21:55 -0400)
committer GitHub <noreply@github.com>
Thu, 26 Apr 2018 01:55:28 +0000 (21:55 -0400)
diff --cc include/deal.II/fe/fe_nothing.h
Simple merge
diff --cc include/deal.II/matrix_free/dof_info.h
Simple merge
diff --cc include/deal.II/matrix_free/fe_evaluation.h
Simple merge
diff --cc include/deal.II/matrix_free/mapping_info.h
Simple merge
diff --cc include/deal.II/matrix_free/mapping_info.templates.h
Simple merge
author	David Wells <drwells@vt.edu>
	Thu, 26 Apr 2018 01:55:28 +0000 (21:55 -0400)
committer	GitHub <noreply@github.com>
	Thu, 26 Apr 2018 01:55:28 +0000 (21:55 -0400)
		1	2
include/deal.II/fe/fe_nothing.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/matrix_free/dof_info.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/matrix_free/fe_evaluation.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/matrix_free/mapping_info.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/matrix_free/mapping_info.templates.h	patch \|	diff1 \|	diff2 \|	blob \| history