From: Matthias Maier Date: Wed, 27 Feb 2013 18:46:57 +0000 (+0000) Subject: Merge from Mainline X-Git-Tag: v8.0.0~1079^2~97 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9ec82710c36b23267709869d16495be72afb2e9;p=dealii.git Merge from Mainline Conflicts: deal.II/aclocal.m4 deal.II/configure deal.II/doc/doxygen/Makefile.in git-svn-id: https://svn.dealii.org/branches/branch_cmake@28623 0785d39b-7218-0410-832d-ea1e28bc413d --- c9ec82710c36b23267709869d16495be72afb2e9