From: Timo Heister Date: Fri, 1 Mar 2013 15:29:55 +0000 (+0000) Subject: merge from mainline X-Git-Tag: v8.0.0~120^2~88 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7595bdd44d2ff8c185265b38ca6dae735f050aab;p=dealii.git merge from mainline git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@28688 0785d39b-7218-0410-832d-ea1e28bc413d --- 7595bdd44d2ff8c185265b38ca6dae735f050aab diff --cc tests/normalize.pl index 73b09fe588,f0490fd217..a4d0f2c1ea --- a/tests/normalize.pl +++ b/tests/normalize.pl @@@ -53,6 -53,3 +53,6 @@@ s/-0\.(0+)(?!\d)/0.\1/g # remove deal.II debug output s/^DEAL.*::_.*\n//g; + - # Normalize version string to 7.3 pre: - s/written by deal\.II .\..\.pre/written by deal.II 7.3.pre/; ++# Normalize version string: ++s/written by deal\.II .\..\.pre/written by deal.II 8.0.pre/;