]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
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)
Conflicts:
deal.II/aclocal.m4

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28390 0785d39b-7218-0410-832d-ea1e28bc413d

13 files changed:
1  2 
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

Simple merge
Simple merge
index 16f51fe291e2374657a9898937d9826c29540b98,bf3528031547d5382ef4ea5f5fad5ce7641d69e8..a0c656e66b624a05f5b38cd37758fd1a530ebb59
mode 100644,100755..100644
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.