From: maier Date: Wed, 27 Feb 2013 18:46:57 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd8b82bc54e1a6c17d1aa0e4f79c90d5bf86bad;p=dealii-svn.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 --- 2fd8b82bc54e1a6c17d1aa0e4f79c90d5bf86bad