]> https://gitweb.dealii.org/ - dealii.git/commit
Merge branch 'master' into parmg
authorTimo Heister <timo.heister@gmail.com>
Thu, 19 Mar 2015 01:17:53 +0000 (19:17 -0600)
committerTimo Heister <timo.heister@gmail.com>
Thu, 19 Mar 2015 01:17:53 +0000 (19:17 -0600)
commit6543ebc0c87aa6943d0481e8c953b851cc2c9648
tree234160b1481cd88961ff06c34212800e13fcf254
parent12479f42cc1b341ac7a58117bef8347ae4977ac1
parent134cd028541b36f82623783c56c9ab7e1128f704
Merge branch 'master' into parmg

Conflicts:
examples/step-50/step-50.cc
examples/step-16/step-16.cc
examples/step-50/step-50.cc
include/deal.II/dofs/dof_tools.h
include/deal.II/meshworker/simple.h
include/deal.II/multigrid/mg_constrained_dofs.h
include/deal.II/multigrid/mg_transfer.templates.h
include/deal.II/numerics/data_out.h
source/dofs/dof_tools.cc
source/dofs/dof_tools.inst.in
source/multigrid/mg_tools.cc
source/multigrid/mg_transfer_prebuilt.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.