From: young Date: Thu, 6 Mar 2014 13:47:48 +0000 (+0000) Subject: A happy merge to from trunk on top of branch. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ac3c00ca656c2ef92b896c284ed484ee31d1a55;p=dealii-svn.git A happy merge to from trunk on top of branch. git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32626 0785d39b-7218-0410-832d-ea1e28bc413d --- 0ac3c00ca656c2ef92b896c284ed484ee31d1a55 diff --cc deal.II/source/fe/fe_values.cc index 199ab74254,163f03d2b7..c82325147c --- a/deal.II/source/fe/fe_values.cc +++ b/deal.II/source/fe/fe_values.cc @@@ -17,6 -17,6 +17,7 @@@ #include #include #include ++// #include #include #include #include