]> https://gitweb.dealii.org/ - dealii.git/commit
Merge from Mainline
authorMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 13 Feb 2013 11:12:24 +0000 (11:12 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 13 Feb 2013 11:12:24 +0000 (11:12 +0000)
commitaf3b1f7c0b66b292b05d9075886d75ba1032bdd8
tree00f1d9ab11904201e1586c164eb4ade45532c813
parent41ee974e3ac5de72487de9dc3b7202a443bf0102
parent02813d55a1ff7a0ea6d873f7810d71823fddd7dc
Merge from Mainline

Conflicts:
deal.II/aclocal.m4
deal.II/configure

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28358 0785d39b-7218-0410-832d-ea1e28bc413d
deal.II/examples/step-18/step-18.cc
deal.II/examples/step-42/step-42.cc
deal.II/examples/step-47/step-47.cc
deal.II/include/deal.II/lac/block_matrix_base.h
deal.II/include/deal.II/lac/sparse_vanka.templates.h
deal.II/source/fe/mapping_q1.cc
deal.II/source/grid/grid_tools.cc
deal.II/source/lac/sparse_direct.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.