From: maier Date: Mon, 21 Jan 2013 08:30:30 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=368b9675f018284eeae43e2adc6e31cf4561df36;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@28146 0785d39b-7218-0410-832d-ea1e28bc413d --- 368b9675f018284eeae43e2adc6e31cf4561df36