From: maier Date: Wed, 7 Aug 2013 09:04:39 +0000 (+0000) Subject: Merge branch 'trunk' into branch_port_to_libcxx X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dc125d994ca21c54c1ae4e1738d9c1cb90de37c;p=dealii-svn.git Merge branch 'trunk' into branch_port_to_libcxx Conflicts: deal.II/source/numerics/data_out.inst.in git-svn-id: https://svn.dealii.org/branches/branch_port_to_libcxx@30242 0785d39b-7218-0410-832d-ea1e28bc413d --- 6dc125d994ca21c54c1ae4e1738d9c1cb90de37c