]> https://gitweb.dealii.org/ - dealii-svn.git/commit
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 13 Feb 2013 18:17:14 +0000 (18:17 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 13 Feb 2013 18:17:14 +0000 (18:17 +0000)
commita4f5474f28ba496a86789497cb9ce11b4a561293
treeb1c2859eb4ae86939696c219cb5f7a2a760f8fe4
parent9fa0c3a2b3c957d6d980c0f9c720b58de4c6060c
parent7540c1bc6e737a6b7a0edfaf1b280067f3dff314
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.