Merge branch 'sdf10' into merge_10_11

scpeters · Dec 29, 2021 · 4ea05ef · 4ea05ef
2 parents 5c6e870 + 5f326e9
commit 4ea05ef
Show file tree

Hide file tree

Showing 47 changed files with 359 additions and 8,890 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -5,5 +5,5 @@ libignition-utils1-dev
 libtinyxml2-dev
 liburdfdom-dev
 libxml2-utils
-python-psutil
+python3-psutil
 ruby-dev