]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 1 Dec 2012 17:38:57 +0000 (17:38 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 1 Dec 2012 17:38:57 +0000 (17:38 +0000)
Conflicts:
deal.II/include/deal.II/grid/tria_objects.h
deal.II/include/deal.II/lac/vector.templates.h

git-svn-id: https://svn.dealii.org/branches/branch_cmake@27720 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/include/deal.II/base/geometry_info.h
deal.II/include/deal.II/dofs/dof_tools.h
deal.II/include/deal.II/grid/grid_tools.h
deal.II/include/deal.II/lac/chunk_sparse_matrix.h
deal.II/include/deal.II/lac/sparse_matrix.h
deal.II/include/deal.II/lac/vector.templates.h
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/dofs/dof_tools.cc
deal.II/source/grid/grid_tools.cc
deal.II/source/lac/constraint_matrix.cc

Simple merge
Simple merge

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.