]> https://gitweb.dealii.org/ - dealii-svn.git/commit
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 8 Feb 2013 21:21:07 +0000 (21:21 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 8 Feb 2013 21:21:07 +0000 (21:21 +0000)
commit6f60b70a1a8e659e15a66c6d3664e7af2babfc23
tree64e98229eb27b829d83996501c817e348ccdd67a
parentb6362e57d1f397cd832d8f9c01915edede6df2eb
parentef8f65f6349dc5669c361ee016168230965c43e8
Merge from Mainline

Conflicts:
deal.II/doc/readme-petsc-trilinos.html
deal.II/doc/readme.html

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28284 0785d39b-7218-0410-832d-ea1e28bc413d
deal.II/doc/development/navbar.html
deal.II/doc/development/toc.html
deal.II/doc/readme.html
deal.II/examples/step-1/doc/intro.dox
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/grid/grid_generator.h
deal.II/include/deal.II/grid/grid_in.h
deal.II/include/deal.II/lac/trilinos_vector_base.h

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.