Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
templates
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tecnalia_robotics-public
templates
Merge requests
!46
Resolve "Add Zivid ROS driver to rosdistro"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Add Zivid ROS driver to rosdistro"
22-add-zivid-ros-driver-to-rosdistro
into
master
Overview
0
Commits
2
Pipelines
3
Changes
1
Merged
Jon Azpiazu
requested to merge
22-add-zivid-ros-driver-to-rosdistro
into
master
5 years ago
Overview
0
Commits
2
Pipelines
3
Changes
1
Expand
Closes
#22 (closed)
Edited
5 years ago
by
Jon Azpiazu
0
0
Merge request reports
Viewing commit
ab6496f6
Prev
Next
Show latest version
1 file
+
3
−
0
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
ab6496f6
Merge branch 'master' into '22-add-zivid-ros-driver-to-rosdistro'
· ab6496f6
Prada Sarasola, Miguel
authored
5 years ago
# Conflicts: # rosdistro/rosdep_tecnalia.yaml
rosdistro/rosdep_tecnalia.yaml
+
3
−
0
Options
@@ -23,6 +23,9 @@ telicam-1.1.0:
@@ -23,6 +23,9 @@ telicam-1.1.0:
zivid
:
zivid
:
ubuntu
:
[
zivid
]
ubuntu
:
[
zivid
]
zivid_telicam_driver
:
ubuntu
:
[
zivid-telicam-driver
]
zivid_ros
:
zivid_ros
:
ubuntu
:
[
ros-kinetic-zivid-camera
]
ubuntu
:
[
ros-kinetic-zivid-camera
]
Loading
