]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 19 Feb 2013 17:51:05 +0000 (17:51 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 19 Feb 2013 17:51:05 +0000 (17:51 +0000)
Conflicts:
deal.II/aclocal.m4
deal.II/common/Make.global_options.in
deal.II/configure
deal.II/doc/doxygen/tutorial/steps.cmapx
deal.II/doc/doxygen/tutorial/steps.pl
deal.II/doc/doxygen/tutorial/steps.png
deal.II/source/Makefile

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

1  2 
deal.II/examples/step-13/step-13.cc
deal.II/examples/step-14/step-14.cc
deal.II/examples/step-42/step-42.cc
deal.II/examples/step-9/step-9.cc
deal.II/include/deal.II/lac/petsc_vector_base.h

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.