Commit c3dd4352 authored by Samuel Debionne's avatar Samuel Debionne
Browse files

Merge branch '138-add-new-camera-ximea' into 'master'

Resolve "add new camera ximea"

Closes #138

See merge request !185
parents 173e0870 8a2c1545
Pipeline #36561 passed with stages
in 51 minutes and 6 seconds
......@@ -139,3 +139,6 @@
[submodule "camera/arinax"]
path = camera/arinax
url = ../Lima-camera-arinax
[submodule "camera/ximea"]
path = camera/ximea
url = ../Lima-camera-ximea
Subproject commit 5b665266959431ae3239c608bb4913c51c81c074
Markdown is supported
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