Skip to content

Commit 88467de

Browse files
author
Marc Alban
committed
Merge pull request swri-robotics#5 from malban/issue_3
fix missing organization in license text
2 parents c0b3bb1 + 5b13c85 commit 88467de

File tree

93 files changed

+93
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+93
-93
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ modification, are permitted provided that the following conditions are met:
88
* Redistributions in binary form must reproduce the above copyright
99
notice, this list of conditions and the following disclaimer in the
1010
documentation and/or other materials provided with the distribution.
11-
* Neither the name of the <organization> nor the
11+
* Neither the name of Southwest Research Institute® (SwRI®) nor the
1212
names of its contributors may be used to endorse or promote products
1313
derived from this software without specific prior written permission.
1414

can_util/include/can_util/can_bus.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

can_util/src/nodes/can_bus_example.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

console_util/include/console_util/progress_bar.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

console_util/src/progress_bar.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

geometry_util/include/geometry_util/intersection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

geometry_util/include/geometry_util/polygon.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

geometry_util/src/intersection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

geometry_util/src/polygon.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/include/image_util/draw_util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/include/image_util/image_matching.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/include/image_util/image_normalization.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/include/image_util/image_warp_util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/include/image_util/motion_estimation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/include/image_util/rolling_normalization.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/draw_util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/geometry_util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/image_matching.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/image_normalization.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/image_warp_util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/motion_estimation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodelets/contrast_stretch_nodelet.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodelets/draw_text_nodelet.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodelets/rotate_image_nodelet.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodelets/scale_image_nodelet.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodes/contrast_stretch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodes/draw_text.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodes/dummy_image_publisher.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodes/normalization_image_generator_node.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodes/rotate_image.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/nodes/scale_image.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/src/rolling_normalization.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/test/image_normalization_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/test/image_warp_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/test/test_geometry_util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

image_util/test/test_motion_estimation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

marti_data_structures/include/marti_data_structures/linked_list.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// * Redistributions in binary form must reproduce the above copyright
1111
// notice, this list of conditions and the following disclaimer in the
1212
// documentation and/or other materials provided with the distribution.
13-
// * Neither the name of the <organization> nor the
13+
// * Neither the name of Southwest Research Institute® (SwRI®) nor the
1414
// names of its contributors may be used to endorse or promote products
1515
// derived from this software without specific prior written permission.
1616
//

0 commit comments

Comments
 (0)