From: maier Date: Tue, 19 Feb 2013 17:51:05 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b22f0249ea12406e33033ba9e6377229e5830015;p=dealii-svn.git Merge from Mainline Conflicts: deal.II/aclocal.m4 deal.II/common/Make.global_options.in deal.II/configure deal.II/doc/doxygen/tutorial/steps.cmapx deal.II/doc/doxygen/tutorial/steps.pl deal.II/doc/doxygen/tutorial/steps.png deal.II/source/Makefile git-svn-id: https://svn.dealii.org/branches/branch_cmake@28475 0785d39b-7218-0410-832d-ea1e28bc413d --- b22f0249ea12406e33033ba9e6377229e5830015