]> https://gitweb.dealii.org/ - dealii.git/commit
Merge from Mainline.
authorMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 3 Dec 2012 23:01:07 +0000 (23:01 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 3 Dec 2012 23:01:07 +0000 (23:01 +0000)
commitb277aeda063d92a6246dd317a6695dc4fe58abab
tree03b916a5e88fd761be34f1d6d221f66fbcfc50b0
parentf021c1ba503c473cefa1b74699ebe443c65ef2fa
Merge from Mainline.

Conflicts:
deal.II/source/dofs/dof_tools.cc

git-svn-id: https://svn.dealii.org/branches/branch_cmake@27743 0785d39b-7218-0410-832d-ea1e28bc413d
12 files changed:
deal.II/examples/step-46/step-46.cc
deal.II/examples/step-6/step-6.cc
deal.II/include/deal.II/grid/tria_objects.h
deal.II/include/deal.II/lac/relaxation_block.h
deal.II/include/deal.II/lac/relaxation_block.templates.h
deal.II/include/deal.II/lac/vector.templates.h
deal.II/include/deal.II/numerics/vector_tools.templates.h
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/dofs/dof_tools.cc
deal.II/source/fe/fe_face.cc
deal.II/source/grid/grid_tools.cc
deal.II/source/lac/trilinos_sparse_matrix.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.