From: Matthias Maier Date: Wed, 13 Feb 2013 11:12:24 +0000 (+0000) Subject: Merge from Mainline X-Git-Tag: v8.0.0~1079^2~141 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af3b1f7c0b66b292b05d9075886d75ba1032bdd8;p=dealii.git Merge from Mainline Conflicts: deal.II/aclocal.m4 deal.II/configure git-svn-id: https://svn.dealii.org/branches/branch_cmake@28358 0785d39b-7218-0410-832d-ea1e28bc413d --- af3b1f7c0b66b292b05d9075886d75ba1032bdd8