]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
merge from mainline
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 1 Mar 2013 15:29:55 +0000 (15:29 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 1 Mar 2013 15:29:55 +0000 (15:29 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@28688 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/examples/step-42/step-42.cc
tests/normalize.pl

Simple merge
index 73b09fe588631846fc78c1a405d2c867d209e272,f0490fd217cf22c11dbe01feef402fc61da70714..a4d0f2c1ea86b5569aebbea4761a6120ef1161f3
@@@ -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/;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.