Merge trunk into branch_manifold_id

Set merge property, resolve merge inconsistencies

Conflicts:
	deal.II/cmake/config/CMakeLists.txt
	deal.II/source/grid/manifold.inst.in
	deal.II/source/grid/tria_objects.cc
	tests/base/reference.debug.output
	tests/bits/data_out_08.output
	tests/distributed_grids/3d_refinement_08.output

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

diff --cc deal.II/cmake/config/CMakeLists.txt
index 0e46258b42e8f45a8f0cec8fedc6f7eb2cb4af38,eea6fdf8f090da5edd0ffd39ed57485776c624a6..c8b3e75f92b1d40ee5619a3b83ab748e83c2b32c
--- 1/deal.II/cmake/config/CMakeLists.txt
--- 2/deal.II/cmake/config/CMakeLists.txt
+++ b/deal.II/cmake/config/CMakeLists.txt
@@@ -164,6 -164,6 +164,7 @@@ CONFIGURE_FILE
    ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake
    @ONLY
    )
++
  INSTALL(FILES
    ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake
    ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake

diff --cc deal.II/examples/step-1/step-1.cc
index 96c701da2ac6a7e7ff4cba98338ceb68664b60af,96da272b2b7164633794c1664510b353897dd1a4..f130c508d532088f02b5f5f4345e454a916551cf
--- 1/deal.II/examples/step-1/step-1.cc
--- 2/deal.II/examples/step-1/step-1.cc
+++ b/deal.II/examples/step-1/step-1.cc
@@@ -1,20 -1,21 +1,19 @@@
 -/* ---------------------------------------------------------------------
 - * $Id$
 - *
 - * Copyright (C) 1999 - 2013 by the deal.II authors
 - *
 - * This file is part of the deal.II library.
 - *
 - * The deal.II library is free software; you can use it, redistribute
 - * it, and/or modify it under the terms of the GNU Lesser General
 - * Public License as published by the Free Software Foundation; either
 - * version 2.1 of the License, or (at your option) any later version.
 - * The full text of the license can be found in the file LICENSE at
 - * the top level of the deal.II distribution.
 - *
 - * ---------------------------------------------------------------------
 -
 - */
 +// ---------------------------------------------------------------------
 +// $Id$
 +//
 +// Copyright (C) 1999 - 2013 by the deal.II authors
 +//
 +// This file is part of the deal.II library.
 +//
 +// The deal.II library is free software; you can use it, redistribute
 +// it, and/or modify it under the terms of the GNU Lesser General
 +// Public License as published by the Free Software Foundation; either
 +// version 2.1 of the License, or (at your option) any later version.
 +// The full text of the license can be found in the file LICENSE at
 +// the top level of the deal.II distribution.
 +//
 +// ---------------------------------------------------------------------
  
- 
  // @sect3{Include files}
  
  // The most fundamental class in the library is the Triangulation class, which

diff --cc deal.II/source/grid/tria_objects.cc
index 2db7e48852f2c71568b43bb766088c8deb5774d6,308f55033c1e63e193850c9de852d2c2a2798975..ff6b22a29670affa1c0dad6cab8099e5808c53e6
--- 1/deal.II/source/grid/tria_objects.cc
--- 2/deal.II/source/grid/tria_objects.cc
+++ b/deal.II/source/grid/tria_objects.cc
@@@ -192,15 -192,7 +192,13 @@@ namespace interna
                                         RefinementCase<G::dimension>::no_refinement);
              }
  
 -        boundary_or_material_id.resize (new_size);
 +          boundary_or_material_id.resize (new_size);
 +
 +          manifold_id.reserve (new_size);
 +          manifold_id.insert (manifold_id.end(),
 +                            new_size-manifold_id.size(),
 +                            numbers::flat_manifold_id);
 +
- 
-         
            user_data.resize (new_size);
          }
  
@@@ -280,12 -272,6 +278,11 @@@
            boundary_or_material_id.reserve (new_size);
            boundary_or_material_id.resize (new_size);
  
-         
 +          manifold_id.reserve (new_size);
 +          manifold_id.insert (manifold_id.end(),
 +                            new_size-manifold_id.size(),
 +                            numbers::flat_manifold_id);
 +
            user_data.reserve (new_size);
            user_data.resize (new_size);
  

diff --cc tests/bits/data_out_08.output
index 4725e3bc01940bb9e2d1eff0751e35b86eb2a076,bd4f3f7361f85f290f719168f1a7ee52ac87aa61..1e6f92e4e36d68909519541ea9b83d5494d5a681
--- 1/tests/bits/data_out_08.output
--- 2/tests/bits/data_out_08.output
+++ b/tests/bits/data_out_08.output
@@@ -12,7 -12,7 +12,11 @@@ cell_dat
  0 1
  0
  1 4
++<<<<<<< HEAD
 +0.0 0.0 0.0 0.0 
++=======
+ 1.0 1.0 1.0 1.0 
++>>>>>>> mirror/trunk
  
  
  [deal.II intermediate Patch<2,2>]
@@@ -21,7 -21,7 +25,11 @@@
  1 1
  0
  1 4
++<<<<<<< HEAD
 +1.0 1.0 1.0 1.0 
++=======
+ 2.0 2.0 2.0 2.0 
++>>>>>>> mirror/trunk
  
  
  [deal.II intermediate Patch<2,2>]
@@@ -30,7 -30,7 +38,11 @@@
  2 1
  0
  1 4
++<<<<<<< HEAD
 +2.0 2.0 2.0 2.0 
++=======
+ 3.0 3.0 3.0 3.0 
++>>>>>>> mirror/trunk
  
  
  0