From e6c204ac679ac52301fae198feee2ec5dad8bdcb Mon Sep 17 00:00:00 2001 From: Manish Mathai Date: Fri, 22 Sep 2017 15:31:27 -0700 Subject: [PATCH] Fix copyright header merge issues --- vtkm/rendering/Canvas.h | 7 ++++--- vtkm/rendering/LineRenderer.cxx | 4 ++-- vtkm/rendering/LineRenderer.h | 8 ++++---- vtkm/rendering/TextRenderer.cxx | 4 ++-- vtkm/rendering/TextRenderer.h | 8 ++++---- vtkm/rendering/Texture2D.h | 8 ++++---- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/vtkm/rendering/Canvas.h b/vtkm/rendering/Canvas.h index 978d56994..887d75dcf 100644 --- a/vtkm/rendering/Canvas.h +++ b/vtkm/rendering/Canvas.h @@ -6,9 +6,9 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. // -// Copyright 2017 Sandia Corporation. -// Copyright 2017 UT-Battelle, LLC. -// Copyright 2017 Los Alamos National Security. +// Copyright 2016 National Technology & Engineering Solutions of Sandia, LLC (NTESS). +// Copyright 2016 UT-Battelle, LLC. +// Copyright 2016 Los Alamos National Security. // // Under the terms of Contract DE-NA0003525 with NTESS, // the U.S. Government retains certain rights in this software. @@ -17,6 +17,7 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ + #ifndef vtk_m_rendering_Canvas_h #define vtk_m_rendering_Canvas_h diff --git a/vtkm/rendering/LineRenderer.cxx b/vtkm/rendering/LineRenderer.cxx index 616bbf4f4..1bfb8ff65 100644 --- a/vtkm/rendering/LineRenderer.cxx +++ b/vtkm/rendering/LineRenderer.cxx @@ -6,11 +6,11 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. // -// Copyright 2016 Sandia Corporation. +// Copyright 2016 National Technology & Engineering Solutions of Sandia, LLC (NTESS). // Copyright 2016 UT-Battelle, LLC. // Copyright 2016 Los Alamos National Security. // -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// Under the terms of Contract DE-NA0003525 with NTESS, // the U.S. Government retains certain rights in this software. // // Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National diff --git a/vtkm/rendering/LineRenderer.h b/vtkm/rendering/LineRenderer.h index dd44b2f9a..e505928b1 100644 --- a/vtkm/rendering/LineRenderer.h +++ b/vtkm/rendering/LineRenderer.h @@ -6,11 +6,11 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. // -// Copyright 2017 Sandia Corporation. -// Copyright 2017 UT-Battelle, LLC. -// Copyright 2017 Los Alamos National Security. +// Copyright 2016 National Technology & Engineering Solutions of Sandia, LLC (NTESS). +// Copyright 2016 UT-Battelle, LLC. +// Copyright 2016 Los Alamos National Security. // -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// Under the terms of Contract DE-NA0003525 with NTESS, // the U.S. Government retains certain rights in this software. // // Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National diff --git a/vtkm/rendering/TextRenderer.cxx b/vtkm/rendering/TextRenderer.cxx index 1c2bca83b..67c7c7f50 100644 --- a/vtkm/rendering/TextRenderer.cxx +++ b/vtkm/rendering/TextRenderer.cxx @@ -6,11 +6,11 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. // -// Copyright 2016 Sandia Corporation. +// Copyright 2016 National Technology & Engineering Solutions of Sandia, LLC (NTESS). // Copyright 2016 UT-Battelle, LLC. // Copyright 2016 Los Alamos National Security. // -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// Under the terms of Contract DE-NA0003525 with NTESS, // the U.S. Government retains certain rights in this software. // // Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National diff --git a/vtkm/rendering/TextRenderer.h b/vtkm/rendering/TextRenderer.h index e82e77ede..1b745ff24 100644 --- a/vtkm/rendering/TextRenderer.h +++ b/vtkm/rendering/TextRenderer.h @@ -6,11 +6,11 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. // -// Copyright 2017 Sandia Corporation. -// Copyright 2017 UT-Battelle, LLC. -// Copyright 2017 Los Alamos National Security. +// Copyright 2016 National Technology & Engineering Solutions of Sandia, LLC (NTESS). +// Copyright 2016 UT-Battelle, LLC. +// Copyright 2016 Los Alamos National Security. // -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// Under the terms of Contract DE-NA0003525 with NTESS, // the U.S. Government retains certain rights in this software. // // Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National diff --git a/vtkm/rendering/Texture2D.h b/vtkm/rendering/Texture2D.h index 6db910288..dc022fd79 100644 --- a/vtkm/rendering/Texture2D.h +++ b/vtkm/rendering/Texture2D.h @@ -6,11 +6,11 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. // -// Copyright 2017 Sandia Corporation. -// Copyright 2017 UT-Battelle, LLC. -// Copyright 2017 Los Alamos National Security. +// Copyright 2016 National Technology & Engineering Solutions of Sandia, LLC (NTESS). +// Copyright 2016 UT-Battelle, LLC. +// Copyright 2016 Los Alamos National Security. // -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// Under the terms of Contract DE-NA0003525 with NTESS, // the U.S. Government retains certain rights in this software. // // Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National