From: maier Date: Fri, 15 Feb 2013 15:10:09 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab2982d329af673165c26e7c703375074aec7033;p=dealii-svn.git Merge from Mainline Conflicts: deal.II/examples/step-42/Makefile git-svn-id: https://svn.dealii.org/branches/branch_cmake@28406 0785d39b-7218-0410-832d-ea1e28bc413d --- ab2982d329af673165c26e7c703375074aec7033