]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 6 Feb 2013 17:27:58 +0000 (17:27 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 6 Feb 2013 17:27:58 +0000 (17:27 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@28255 0785d39b-7218-0410-832d-ea1e28bc413d

24 files changed:
1  2 
deal.II/include/deal.II/base/utilities.h
deal.II/include/deal.II/grid/grid_generator.h
deal.II/include/deal.II/lac/block_matrix_base.h
deal.II/include/deal.II/lac/constraint_matrix.templates.h
deal.II/include/deal.II/lac/sparse_matrix.h
deal.II/include/deal.II/lac/sparse_matrix.templates.h
deal.II/include/deal.II/lac/sparsity_pattern.h
deal.II/include/deal.II/matrix_free/mapping_info.templates.h
deal.II/include/deal.II/matrix_free/matrix_free.h
deal.II/include/deal.II/numerics/vector_tools.templates.h
deal.II/source/base/utilities.cc
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/dofs/dof_tools.cc
deal.II/source/grid/grid_generator.cc
deal.II/source/lac/constraint_matrix.cc
deal.II/source/lac/petsc_parallel_vector.cc
deal.II/source/lac/petsc_solver.cc
deal.II/source/lac/petsc_sparse_matrix.cc
deal.II/source/lac/petsc_vector_base.cc
deal.II/source/lac/slepc_solver.cc
deal.II/source/lac/sparse_direct.cc
deal.II/source/lac/trilinos_sparse_matrix.cc
deal.II/source/multigrid/mg_tools.cc
deal.II/source/numerics/matrix_tools.cc

index 4410eaec09aaeffa2032369517f0453517699dd7,39f53c565bddf62f2ef43e58c42de1c445dd7eb9..d9b5e8938c782c328d547ad44b5041e4a8a60615
@@@ -297,9 -297,10 +297,9 @@@ public
    static
    void
    parallelogram(Triangulation<dim> &tria,
-               const Point<dim> (&corners)[dim],
-               const bool           colorize=false);
+                 const Point<dim> (&corners)[dim],
+                 const bool           colorize=false);
  
 -
    /**
     * @deprecated Use the other function of same name.
     */
Simple merge
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.