Commit 26a733a4 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Merge branch 'master' into 'development'

# Conflicts:
#   CMakeLists.txt
parents 38287838 04b348b6
...@@ -65,6 +65,7 @@ add_service_files( ...@@ -65,6 +65,7 @@ add_service_files(
get_opendrive_nodes.srv get_opendrive_nodes.srv
set_semaphore.srv set_semaphore.srv
set_car_lights.srv set_car_lights.srv
jury_mode.srv
# Service1.srv # Service1.srv
# Service2.srv # Service2.srv
) )
......
bool enable
---
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