]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 15 Feb 2013 15:10:09 +0000 (15:10 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 15 Feb 2013 15:10:09 +0000 (15:10 +0000)
Conflicts:
deal.II/examples/step-42/Makefile

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

14 files changed:
1  2 
deal.II/examples/step-42/step-42.cc
deal.II/include/deal.II/base/exceptions.h
deal.II/include/deal.II/base/smartpointer.h
deal.II/include/deal.II/fe/fe_poly_tensor.h
deal.II/include/deal.II/fe/mapping_q1_eulerian.h
deal.II/include/deal.II/fe/mapping_q_eulerian.h
deal.II/include/deal.II/grid/tria_boundary.h
deal.II/include/deal.II/lac/parallel_vector.h
deal.II/include/deal.II/lac/trilinos_vector_base.h
deal.II/include/deal.II/numerics/matrix_tools.h
deal.II/include/deal.II/numerics/vector_tools.h
deal.II/include/deal.II/numerics/vector_tools.templates.h
deal.II/source/lac/petsc_parallel_vector.cc
deal.II/source/lac/petsc_vector_base.cc

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.