Merge from Mainline

Conflicts:
	deal.II/configure
	deal.II/configure.in
	deal.II/contrib/configure
	deal.II/contrib/utilities/configure
	deal.II/doc/doxygen/Makefile.in
	deal.II/examples/step-42/step-42.cc

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

diff --cc deal.II/doc/doxygen/scripts/program2doxygen
Simple merge

diff --cc deal.II/doc/doxygen/scripts/validate-xrefs.pl
Simple merge

diff --cc deal.II/examples/step-42/step-42.cc
index cf3a6203ab47c7f2a7dc657a1336841d18894ad4,501dac8dd1be9eb433b1bb79db8926b7320150a3..d8dc043fcfdbbc32e377ce6d60c0eec2425622d6
--- 1/deal.II/examples/step-42/step-42.cc
--- 2/deal.II/examples/step-42/step-42.cc
+++ b/deal.II/examples/step-42/step-42.cc
@@@ -396,11 -310,11 +310,19 @@@ namespace Step4
    }
  
    template <int dim>
++<<<<<<< HEAD
 +  void ConstitutiveLaw<dim>::plast_linear_hardening (SymmetricTensor<4,dim>  &stress_strain_tensor,
 +                                                     SymmetricTensor<2,dim>  &strain_tensor,
 +                                                     unsigned int            &elast_points,
 +                                                     unsigned int            &plast_points,
 +                                                     double                  &yield)
++=======
+   void ConstitutiveLaw<dim>::plast_linear_hardening (SymmetricTensor<4,dim>     &stress_strain_tensor,
+                                                      const SymmetricTensor<2,dim> &strain_tensor,
+                                                      unsigned int                       &elast_points,
+                                                      unsigned int               &plast_points,
+                                                      double                     &yield)
++>>>>>>> mirror/trunk
    {
      if (dim == 3)
        {
@@@ -429,9 -343,9 +351,15 @@@
    }
  
    template <int dim>
++<<<<<<< HEAD
 +  void ConstitutiveLaw<dim>::linearized_plast_linear_hardening (SymmetricTensor<4,dim>  &stress_strain_tensor_linearized,
 +      SymmetricTensor<4,dim>  &stress_strain_tensor,
 +      SymmetricTensor<2,dim>  &strain_tensor)
++=======
+   void ConstitutiveLaw<dim>::linearized_plast_linear_hardening (SymmetricTensor<4,dim>                 &stress_strain_tensor_linearized,
+                                                                                                                               SymmetricTensor<4,dim>           &stress_strain_tensor,
+                                                                                                                               const SymmetricTensor<2,dim> &strain_tensor)
++>>>>>>> mirror/trunk
    {
      if (dim == 3)
        {