]> https://gitweb.dealii.org/ - dealii.git/commitdiff
merge from mainline
authorTimo Heister <timo.heister@gmail.com>
Fri, 22 Feb 2013 17:20:27 +0000 (17:20 +0000)
committerTimo Heister <timo.heister@gmail.com>
Fri, 22 Feb 2013 17:20:27 +0000 (17:20 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@28529 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/examples/step-20/step-20.cc
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/base/logstream.h
deal.II/include/deal.II/lac/parallel_vector.h
deal.II/include/deal.II/lac/petsc_matrix_base.h
deal.II/include/deal.II/lac/petsc_parallel_block_vector.h
deal.II/include/deal.II/lac/trilinos_block_vector.h
deal.II/include/deal.II/lac/trilinos_parallel_block_vector.h
deal.II/include/deal.II/lac/vector.h
deal.II/include/deal.II/multigrid/mg_tools.h

Simple merge
Simple merge
Simple merge

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.