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

1  2 
deal.II/include/deal.II/grid/grid_generator.h
deal.II/include/deal.II/lac/petsc_matrix_free.h
deal.II/include/deal.II/lac/petsc_parallel_vector.h
deal.II/include/deal.II/lac/trilinos_vector.h
deal.II/include/deal.II/lac/trilinos_vector_base.h
deal.II/include/deal.II/lac/vector.templates.h
deal.II/source/lac/petsc_parallel_vector.cc
deal.II/source/lac/trilinos_vector.cc
deal.II/source/lac/trilinos_vector_base.cc
tests/Makefile

Simple merge
diff --cc tests/Makefile
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.