From: maier Date: Tue, 12 Feb 2013 15:31:03 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c083be226eb1c5a720dd0bafd9352956e0ace2a6;p=dealii-svn.git Merge from Mainline Conflicts: deal.II/source/Makefile git-svn-id: https://svn.dealii.org/branches/branch_cmake@28327 0785d39b-7218-0410-832d-ea1e28bc413d --- c083be226eb1c5a720dd0bafd9352956e0ace2a6