Skip to content

Commit

Permalink
Updated license to agree with ROS standard.
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Fankhauser committed Mar 30, 2015
1 parent 617f4c6 commit 9d2389b
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 25 deletions.
41 changes: 22 additions & 19 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
The MIT License (MIT)
Copyright (c) 2015, Péter Fankhauser, Autonomous Systems Lab, ETH Zurich
All rights reserved.

Copyright (c) 2014 Péter Fankhauser, Autonomous Systems Lab, ETH Zurich
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 copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
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 COPYRIGHT HOLDER 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.
2 changes: 1 addition & 1 deletion grid_map/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>0.1.0</version>
<description>ROS interface for the grid map library.</description>
<maintainer email="[email protected]">Peter Fankhauser</maintainer>
<license>MIT</license>
<license>BSD</license>
<url type="website">http://github.com/ethz-asl/grid_map</url>
<url type="bugtracker">http://github.com/ethz-asl/grid_map/issues</url>
<author email="[email protected]">Peter Fankhauser</author>
Expand Down
2 changes: 1 addition & 1 deletion grid_map_core/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>0.1.0</version>
<description>General library for handling of grid maps.</description>
<maintainer email="[email protected]">Peter Fankhauser</maintainer>
<license>MIT</license>
<license>BSD</license>
<url type="website">http://github.com/ethz-asl/grid_map</url>
<url type="bugtracker">http://github.com/ethz-asl/grid_map/issues</url>
<author email="[email protected]">Peter Fankhauser</author>
Expand Down
2 changes: 1 addition & 1 deletion grid_map_demos/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>0.1.0</version>
<description>Demo nodes to show usage of the grid map library.</description>
<maintainer email="[email protected]">Peter Fankhauser</maintainer>
<license>MIT</license>
<license>BSD</license>
<url type="website">http://github.com/ethz-asl/grid_map</url>
<url type="bugtracker">http://github.com/ethz-asl/grid_map/issues</url>
<author email="[email protected]">Peter Fankhauser</author>
Expand Down
2 changes: 1 addition & 1 deletion grid_map_filters/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>0.1.0</version>
<description>library for filtering gri maps.</description>
<maintainer email="[email protected]">Peter Fankhauser</maintainer>
<license>MIT</license>
<license>BSD</license>
<url type="website">http://github.com/ethz-asl/grid_map</url>
<url type="bugtracker">http://github.com/ethz-asl/grid_map/issues</url>
<author email="[email protected]">Martin Wermelinger</author>
Expand Down
2 changes: 1 addition & 1 deletion grid_map_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>0.1.0</version>
<description>Definition of the grid_map_msgs type.</description>
<maintainer email="[email protected]">Peter Fankhauser</maintainer>
<license>MIT</license>
<license>BSD</license>
<url type="website">http://github.com/ethz-asl/grid_map</url>
<url type="bugtracker">http://github.com/ethz-asl/grid_map/issues</url>
<author email="[email protected]">Peter Fankhauser</author>
Expand Down
2 changes: 1 addition & 1 deletion grid_map_visualization/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>0.1.0</version>
<description>Provides the topics to visualize a grid map in Rviz.</description>
<maintainer email="[email protected]">Peter Fankhauser</maintainer>
<license>MIT</license>
<license>BSD</license>
<url type="website">http://github.com/ethz-asl/grid_map</url>
<url type="bugtracker">http://github.com/ethz-asl/grid_map/issues</url>
<author email="[email protected]">Peter Fankhauser</author>
Expand Down

0 comments on commit 9d2389b

Please sign in to comment.