]> https://gitweb.dealii.org/ - dealii.git/commit
Merge from Mainline
authorMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 8 Feb 2013 21:21:07 +0000 (21:21 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 8 Feb 2013 21:21:07 +0000 (21:21 +0000)
commit69f5795a510c26fbd84bbda9235940a4883ce3dd
treea6054b1eaf06e3c7bbf725c88cc21b2d70d4754e
parent146dc51c21cf0476f26656c1127201fa83295654
parent488d6c3c10cdef593b7131fc2f6c7fc5a9c10797
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.