]> https://gitweb.dealii.org/ - dealii.git/commit
Merge branch 'master' into parmg
authorTimo Heister <timo.heister@gmail.com>
Fri, 19 Dec 2014 15:01:59 +0000 (10:01 -0500)
committerTimo Heister <timo.heister@gmail.com>
Fri, 19 Dec 2014 15:01:59 +0000 (10:01 -0500)
commit8fac36883cb8164d4a94aea2a98fdec8c246cc65
treeca545534fe4d0df548c8cf99f2bc2d7c677680b1
parent3dcc53afd9ceb63e9aa40207ebb9805fd926d098
parentf2670cf963d98a1a30b6615e1d5e6fe62e57f5ab
Merge branch 'master' into parmg

Conflicts:
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
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.