Merge pull request #813 from scpeters/merge_12_main

Merge sdf12 -> main
gazebosim · Jan 3, 2022 · 1df5df2 · 1df5df2
2 parents 1495b3f + fc5d1f2
commit 1df5df2
Show file tree

Hide file tree

Showing 60 changed files with 733 additions and 8,937 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