]> https://gitweb.dealii.org/ - dealii.git/commit
Merge remote-tracking branch 'mirror/trunk' into branch_cmake
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 9 Aug 2012 09:43:04 +0000 (09:43 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 9 Aug 2012 09:43:04 +0000 (09:43 +0000)
commitdab4bcdad9a07a919158394b0443b3f5530740e6
treeffa72bcd1ecd28a6efb78bde1f944cf8dfc6851d
parente3cdbb85a3db277451fda8f22eea3f68b7e4f9d3
Merge remote-tracking branch 'mirror/trunk' into branch_cmake

Conflicts:
deal.II/source/Makefile

git-svn-id: https://svn.dealii.org/branches/branch_cmake@25798 0785d39b-7218-0410-832d-ea1e28bc413d
32 files changed:
deal.II/common/Make.global_options.in
deal.II/doc/news/changes.h
deal.II/doc/publications/index.html
deal.II/doc/readme.html
deal.II/examples/step-32/doc/intro.dox
deal.II/examples/step-42/doc/intro-step-42.tex [new file with mode: 0644]
deal.II/include/deal.II/integrators/laplace.h
deal.II/include/deal.II/lac/petsc_matrix_base.h
deal.II/include/deal.II/lac/petsc_parallel_sparse_matrix.h
deal.II/include/deal.II/lac/petsc_sparse_matrix.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/numerics/point_value_history.h
deal.II/source/lac/petsc_matrix_base.cc
deal.II/source/lac/petsc_parallel_sparse_matrix.cc
deal.II/source/lac/petsc_sparse_matrix.cc
deal.II/source/numerics/dof_output_operator.cc [moved from deal.II/source/numerics/operator.cc with 96% similarity]
deal.II/source/numerics/dof_output_operator.inst.in [moved from deal.II/source/numerics/operator.inst.in with 100% similarity]
deal.II/source/numerics/point_value_history.cc
tests/deal.II/point_value_history_01.cc
tests/deal.II/point_value_history_01/cmp/generic
tests/deal.II/point_value_history_02.cc [new file with mode: 0644]
tests/deal.II/point_value_history_02/cmp/generic [new file with mode: 0644]
tests/deal.II/point_value_history_03.cc [new file with mode: 0644]
tests/deal.II/point_value_history_03/cmp/generic [new file with mode: 0644]
tests/integrators/laplacian_01.cc [new file with mode: 0644]
tests/integrators/laplacian_01/cmp/generic [new file with mode: 0644]
tests/mpi/constraint_matrix_trilinos_bug.cc
tests/mpi/p4est_2d_constraintmatrix_03.cc
tests/mpi/p4est_2d_constraintmatrix_04.cc
tests/mpi/p4est_3d_constraintmatrix_02.cc
tests/mpi/p4est_3d_constraintmatrix_03.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.