]> https://gitweb.dealii.org/ - dealii.git/commit
Merge from Mainline
authorMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 13 Feb 2013 18:17:14 +0000 (18:17 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 13 Feb 2013 18:17:14 +0000 (18:17 +0000)
commit2bbabfe02324175eed804848cc650ee15d8ad0b2
tree99873af1bedd814e0c092be64ecc0f8e6deb1423
parent651699afe6a3149445f7dc35b345b340a0efc20a
parent4fa39b32096e4f3c381cf755c4f6792838114042
Merge from Mainline

Conflicts:
deal.II/aclocal.m4

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28390 0785d39b-7218-0410-832d-ea1e28bc413d
13 files changed:
deal.II/examples/step-32/step-32.cc
deal.II/examples/step-35/step-35.cc
deal.II/include/deal.II/lac/constraint_matrix.templates.h
deal.II/include/deal.II/lac/petsc_vector_base.h
deal.II/include/deal.II/lac/trilinos_vector_base.h
deal.II/source/lac/constraint_matrix.cc
deal.II/source/lac/petsc_matrix_free.cc
deal.II/source/lac/petsc_parallel_vector.cc
deal.II/source/lac/petsc_vector_base.cc
deal.II/source/lac/sparse_direct.cc
deal.II/source/numerics/derivative_approximation.cc
deal.II/source/numerics/error_estimator.cc
deal.II/source/numerics/matrix_tools.cc

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.