From 6cc4f7309138ea194cea7573a125a4b81c8d918c Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Thu, 15 Jan 2015 22:12:10 +0100 Subject: [PATCH 1/2] robot_simulator: add BSD license header. Fix #90. --- .../industrial_robot_simulator | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/industrial_robot_simulator/industrial_robot_simulator b/industrial_robot_simulator/industrial_robot_simulator index 362bd226..44680bdd 100755 --- a/industrial_robot_simulator/industrial_robot_simulator +++ b/industrial_robot_simulator/industrial_robot_simulator @@ -1,4 +1,34 @@ #!/usr/bin/env python +# +# Software License Agreement (BSD License) +# +# Copyright (c) 2012-2014, Southwest Research Institute +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the Southwest Research Institute, nor the names +# of its contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# import rospy import copy From 568a2a91802bf90ee12224e2c022c0a9b5503486 Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Fri, 16 Jan 2015 08:54:30 +0100 Subject: [PATCH 2/2] robot_simulator: add TU Delft copyright as well. --- industrial_robot_simulator/industrial_robot_simulator | 1 + 1 file changed, 1 insertion(+) diff --git a/industrial_robot_simulator/industrial_robot_simulator b/industrial_robot_simulator/industrial_robot_simulator index 44680bdd..9f676247 100755 --- a/industrial_robot_simulator/industrial_robot_simulator +++ b/industrial_robot_simulator/industrial_robot_simulator @@ -3,6 +3,7 @@ # Software License Agreement (BSD License) # # Copyright (c) 2012-2014, Southwest Research Institute +# Copyright (c) 2014-2015, TU Delft Robotics Institute # All rights reserved. # # Redistribution and use in source and binary forms, with or without