]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 13 Feb 2013 11:12:24 +0000 (11:12 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 13 Feb 2013 11:12:24 +0000 (11:12 +0000)
Conflicts:
deal.II/aclocal.m4
deal.II/configure

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

1  2 
deal.II/examples/step-18/step-18.cc
deal.II/examples/step-42/step-42.cc
deal.II/examples/step-47/step-47.cc
deal.II/include/deal.II/lac/block_matrix_base.h
deal.II/include/deal.II/lac/sparse_vanka.templates.h
deal.II/source/fe/mapping_q1.cc
deal.II/source/grid/grid_tools.cc
deal.II/source/lac/sparse_direct.cc
deal.II/source/numerics/matrix_tools.cc

Simple merge
Simple merge
Simple merge
Simple merge
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.