Merge branch 'master' into '22-add-zivid-ros-driver-to-rosdistro'

# Conflicts: # rosdistro/rosdep_tecnalia.yaml

Merge branch 'master' into '22-add-zivid-ros-driver-to-rosdistro'
ab6496f6 · Prada Sarasola, Miguel · 5481d0d2 · d5b00f5c · ab6496f6
Commit ab6496f6 authored 5 years ago by Prada Sarasola, Miguel
--- a/rosdistro/rosdep_tecnalia.yaml
+++ b/rosdistro/rosdep_tecnalia.yaml
@@ -23,6 +23,9 @@ telicam-1.1.0:
 zivid:
  ubuntu: [zivid]

+zivid_telicam_driver:
+  ubuntu: [zivid-telicam-driver]
+
 zivid_ros:
  ubuntu: [ros-kinetic-zivid-camera]