]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
A happy merge to from trunk on top of branch.
authoryoung <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 6 Mar 2014 13:47:48 +0000 (13:47 +0000)
committeryoung <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 6 Mar 2014 13:47:48 +0000 (13:47 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32626 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/include/deal.II/lac/parallel_vector.templates.h
deal.II/source/fe/fe_values.cc
deal.II/source/numerics/data_out.cc
deal.II/source/numerics/data_out_dof_data.cc
deal.II/source/numerics/data_out_faces.cc
deal.II/source/numerics/point_value_history.cc

index 199ab74254c8ed912a539470ded38a5b2a8b89b6,163f03d2b7f0350ad49cb53e16aead969bea3dd3..c82325147cbc1b253431694e6aadc2b1264b90b3
@@@ -17,6 -17,6 +17,7 @@@
  #include <deal.II/base/memory_consumption.h>
  #include <deal.II/base/multithread_info.h>
  #include <deal.II/base/quadrature.h>
++// #include <deal.II/base/table.h>
  #include <deal.II/lac/vector.h>
  #include <deal.II/lac/block_vector.h>
  #include <deal.II/lac/parallel_vector.h>
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.