From: Matthias Maier Date: Wed, 13 Feb 2013 18:17:14 +0000 (+0000) Subject: Merge from Mainline X-Git-Tag: v8.0.0~1079^2~139 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bbabfe02324175eed804848cc650ee15d8ad0b2;p=dealii.git Merge from Mainline Conflicts: deal.II/aclocal.m4 git-svn-id: https://svn.dealii.org/branches/branch_cmake@28390 0785d39b-7218-0410-832d-ea1e28bc413d --- 2bbabfe02324175eed804848cc650ee15d8ad0b2 diff --cc deal.II/source/lac/petsc_matrix_free.cc index 16f51fe291,bf35280315..a0c656e66b mode 100644,100755..100644 --- a/deal.II/source/lac/petsc_matrix_free.cc +++ b/deal.II/source/lac/petsc_matrix_free.cc