Commit ab6496f6 authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

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

# Conflicts:
#   rosdistro/rosdep_tecnalia.yaml
parents 5481d0d2 d5b00f5c
...@@ -23,6 +23,9 @@ telicam-1.1.0: ...@@ -23,6 +23,9 @@ telicam-1.1.0:
zivid: zivid:
ubuntu: [zivid] ubuntu: [zivid]
ubuntu: [zivid-telicam-driver]
zivid_ros: zivid_ros:
ubuntu: [ros-kinetic-zivid-camera] ubuntu: [ros-kinetic-zivid-camera]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment