]> https://gitweb.dealii.org/ - dealii.git/commit
Merge from Mainline
authorMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 12 Feb 2013 15:31:03 +0000 (15:31 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 12 Feb 2013 15:31:03 +0000 (15:31 +0000)
commit41ee974e3ac5de72487de9dc3b7202a443bf0102
tree421288eb8b83e2ef90c8eacda45b225ce3ed96f2
parenta4416a5d13fc296a34d2d305eaf361585bcf7044
parentd64d447ce57b30583c483900f57acc029ce0e0a6
Merge from Mainline

Conflicts:
deal.II/source/Makefile

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28327 0785d39b-7218-0410-832d-ea1e28bc413d
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/lac/sparse_matrix.h
deal.II/include/deal.II/lac/sparsity_pattern.h
deal.II/source/lac/trilinos_sparse_matrix.cc
deal.II/source/lac/trilinos_sparsity_pattern.cc
deal.II/source/multigrid/mg_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.