From: maier Date: Wed, 13 Feb 2013 18:17:14 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4f5474f28ba496a86789497cb9ce11b4a561293;p=dealii-svn.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 --- a4f5474f28ba496a86789497cb9ce11b4a561293 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