Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tecnalia_robotics-public
templates
Commits
ab6496f6
Commit
ab6496f6
authored
May 14, 2020
by
Prada Sarasola, Miguel
Browse files
Merge branch 'master' into '22-add-zivid-ros-driver-to-rosdistro'
# Conflicts: # rosdistro/rosdep_tecnalia.yaml
parents
5481d0d2
d5b00f5c
Pipeline
#27065
passed with stage
in 29 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
rosdistro/rosdep_tecnalia.yaml
View file @
ab6496f6
...
...
@@ -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
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment