]> https://gitweb.dealii.org/ - dealii.git/commit
Merge from Mainline
authorMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 25 Feb 2013 12:52:47 +0000 (12:52 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 25 Feb 2013 12:52:47 +0000 (12:52 +0000)
commitcdf9aec0ad7547a8d2f522c5b8354a49325a9990
treeacbd395492b8c73d7bb5089c77e2680be39bf198
parentfc51a1d338462ed06f024f12258a22a3d833bd04
parent9efd9ac6ed9f4989484acb897fa6a8ed852142bd
Merge from Mainline

Conflicts:
deal.II/common/Make.global_options.in
deal.II/examples/step-42/Makefile

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28547 0785d39b-7218-0410-832d-ea1e28bc413d
13 files changed:
deal.II/examples/step-20/step-20.cc
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/base/logstream.h
deal.II/include/deal.II/base/thread_management.h
deal.II/include/deal.II/grid/grid_generator.h
deal.II/include/deal.II/lac/parallel_vector.h
deal.II/include/deal.II/lac/petsc_matrix_base.h
deal.II/include/deal.II/lac/petsc_parallel_block_vector.h
deal.II/include/deal.II/lac/trilinos_block_vector.h
deal.II/include/deal.II/lac/trilinos_parallel_block_vector.h
deal.II/include/deal.II/lac/vector.h
deal.II/include/deal.II/multigrid/mg_dof_handler.h
deal.II/include/deal.II/multigrid/mg_tools.h

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.