Skip to content

Commit 9e72b8a

Browse files
authored
Merge pull request #1764 from iory/fix-typo-license
Fixed typo of Software License Agreement. and/o2r to and/or
2 parents 2a26be4 + 2f72ecc commit 9e72b8a

Some content is hidden

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

56 files changed

+56
-56
lines changed

jsk_network_tools/src/silverhammer_highspeed_internal_receiver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* notice, this list of conditions and the following disclaimer.
1313
* * Redistributions in binary form must reproduce the above
1414
* copyright notice, this list of conditions and the following
15-
* disclaimer in the documentation and/o2r other materials provided
15+
* disclaimer in the documentation and/or other materials provided
1616
* with the distribution.
1717
* * Neither the name of the JSK Lab nor the names of its
1818
* contributors may be used to endorse or promote products derived

jsk_ros_patch/image_view2/image_view2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the Willow Garage nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_ros_patch/image_view2/image_view2_node.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_tilt_laser/src/multisense_killer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_tilt_laser/src/spin_laser_snapshotter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the Willow Garage nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/cmake/single_nodelet_exec.cpp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* notice, this list of conditions and the following disclaimer.
1313
* * Redistributions in binary form must reproduce the above
1414
* copyright notice, this list of conditions and the following
15-
* disclaimer in the documentation and/o2r other materials provided
15+
* disclaimer in the documentation and/or other materials provided
1616
* with the distribution.
1717
* * Neither the name of the JSK Lab nor the names of its
1818
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/block_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/color_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/connection_based_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/counter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/deprecated_relay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/diagnostic_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/diagnostic_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/hz_measure_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/jsk_topic_tools_version.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/lightweight_throttle_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* notice, this list of conditions and the following disclaimer.
1313
* * Redistributions in binary form must reproduce the above
1414
* copyright notice, this list of conditions and the following
15-
* disclaimer in the documentation and/o2r other materials provided
15+
* disclaimer in the documentation and/or other materials provided
1616
* with the distribution.
1717
* * Neither the name of the JSK Lab nor the names of its
1818
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/log_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/mux_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* notice, this list of conditions and the following disclaimer.
1313
* * Redistributions in binary form must reproduce the above
1414
* copyright notice, this list of conditions and the following
15-
* disclaimer in the documentation and/o2r other materials provided
15+
* disclaimer in the documentation and/or other materials provided
1616
* with the distribution.
1717
* * Neither the name of the JSK Lab nor the names of its
1818
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/nodelet_version.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/passthrough_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/relay_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/rosparam_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/series_boolean.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/snapshot_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/stealth_relay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/string_relay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/synchronized_throttle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/time_accumulator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/timered_diagnostic_updater.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/vital_checker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/include/jsk_topic_tools/vital_checker_nodelet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/src/block_nodelet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* notice, this list of conditions and the following disclaimer.
1313
* * Redistributions in binary form must reproduce the above
1414
* copyright notice, this list of conditions and the following
15-
* disclaimer in the documentation and/o2r other materials provided
15+
* disclaimer in the documentation and/or other materials provided
1616
* with the distribution.
1717
* * Neither the name of the JSK Lab nor the names of its
1818
* contributors may be used to endorse or promote products derived

jsk_topic_tools/src/color_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/src/connection_based_nodelet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/src/counter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/src/deprecated_relay_nodelet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/src/diagnostic_nodelet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

jsk_topic_tools/src/diagnostic_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* notice, this list of conditions and the following disclaimer.
1414
* * Redistributions in binary form must reproduce the above
1515
* copyright notice, this list of conditions and the following
16-
* disclaimer in the documentation and/o2r other materials provided
16+
* disclaimer in the documentation and/or other materials provided
1717
* with the distribution.
1818
* * Neither the name of the JSK Lab nor the names of its
1919
* contributors may be used to endorse or promote products derived

0 commit comments

Comments
 (0)