]> https://gitweb.dealii.org/ - dealii.git/commit
Merge remote-tracking branch 'upstream/master' into parmg
authorTimo Heister <timo.heister@gmail.com>
Sun, 4 Oct 2015 18:43:21 +0000 (14:43 -0400)
committerTimo Heister <timo.heister@gmail.com>
Sun, 4 Oct 2015 18:46:43 +0000 (14:46 -0400)
commitba0e7dbe97b9809d9364045fda0d2cb560aa70e2
treee8b118b9130af48b805c0da874628b570bfad716
parentaa657acdd9173d76b0ac7e0030f701fd38b6ffe2
parentb3e84942bef98865df8c6259ca632254bf668298
Merge remote-tracking branch 'upstream/master' into parmg

Conflicts:
examples/step-50/step-50.cc
include/deal.II/dofs/dof_tools.h
include/deal.II/grid/cell_id.h
include/deal.II/multigrid/mg_transfer.h
include/deal.II/multigrid/mg_transfer.templates.h
source/multigrid/mg_transfer_prebuilt.cc
12 files changed:
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.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.