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