Merge branch 'master' into 'feature/call_via_memory'

# Conflicts: # CMakeLists.txt

Merge branch 'master' into 'feature/call_via_memory'
ded7d714 · HerrmannTell · 4039b8ec · 27204e21 · ded7d714
Commit ded7d714 authored 2 years ago by HerrmannTell
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ armarx_find_package(PUBLIC armarx_control REQUIRED)
 armarx_find_package(PUBLIC ArmarXGui QUIET)

 # Required system dependencies.
-#armarx_find_package(PUBLIC OpenCV REQUIRED)
+# armarx_find_package(PUBLIC OpenCV REQUIRED)

 # Optional system dependencies.
 # armarx_find_package(PUBLIC PCL QUIET)