]> https://gitweb.dealii.org/ - dealii-svn.git/commit
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 12 Feb 2013 15:31:03 +0000 (15:31 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 12 Feb 2013 15:31:03 +0000 (15:31 +0000)
commitc083be226eb1c5a720dd0bafd9352956e0ace2a6
tree7202e3583903acea89f709a2886eb77c96078593
parent0ee38786c058d58abcc9aaf50f3654a2001b9a56
parent6253d738d4c204e63b0ce9752d6870d385018168
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.