Skip to content

Commit

Permalink
Merge README + LICENSE files from melodic-devel
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Aug 14, 2022
2 parents d71d996 + b682a62 commit eb2168b
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 24 deletions.
27 changes: 27 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Copyright Robert Haschke, Bielefeld University

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. 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.

3. 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.

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 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.
32 changes: 8 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,16 @@ rviz is a 3D visualizer for the Robot Operating System (ROS) framework.

For more information, please see the wiki: http://wiki.ros.org/rviz

This package contains Public Domain icons downloaded from http://tango.freedesktop.org/releases/.

Upstream Authors (2005-2009):

- Ulisse Perusin `<[email protected]>`
- Steven Garrity `<[email protected]>`
- Lapo Calamandrei `<[email protected]>`
- Ryan Collier `<[email protected]>`
- Rodney Dawes `<[email protected]>`
- Andreas Nilsson `<[email protected]>`
- Tuomas Kuosmanen `<[email protected]>`
- Garrett LeSage `<[email protected]>`
- Jakub Steiner `<[email protected]>`
Maintainers:
- Robert Haschke (2019-)
- William Woodall (2013-2018)
- David Gossow (2013)
- Dave Hershberger (2011-2013)
- Josh Faust (2010)

Other icons and graphics contained in this package are released into the
Public Domain as well.

Authors (2012-2019):
This package contains Public Domain icons downloaded from http://tango.freedesktop.org/releases/.

- David Gossow
- Chad Rockey
- Kei Okada
- Julius Kammerl
- Acorn Pooley
- Rein Appeldoorn
- Robert Haschke
Other icons and graphics contained in this package are released into the Public Domain as well.

Copyright notice for all icons and graphics in this package:

Expand Down

0 comments on commit eb2168b

Please sign in to comment.