Merge branch '2.9' into pin-names

havardAasen · Dec 17, 2023 · aefe2f5 · aefe2f5
2 parents a9e0369 + 167bcd1
commit aefe2f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/debian/control.top.in b/debian/control.top.in
@@ -23,7 +23,7 @@ Build-Depends:
     intltool,
     libboost-python-dev,
     libepoxy-dev,
-    libgl1-mesa-dev | libgl1-mesa-swx11-dev,
+    libgl-dev | libgl1-mesa-dev,
     libglu1-mesa-dev,
     libgtk2.0-dev,
     libgtk-3-dev,

diff --git a/src/emc/motion/motion.c b/src/emc/motion/motion.c
@@ -345,6 +345,7 @@ int rtapi_app_main(void)
     rtapi_print_msg(RTAPI_MSG_ERR, _("MOTION: Can't specify both names and number for misc error\n"));
     return -1;
   }
+
   if (names_misc_errors[0]) {
     num_misc_error = count_names(names_misc_errors);
   } else if (num_misc_error == NOT_INITIALIZED) {