Merge tag 'v2.12.0' into drake

# Conflicts: # .github/dependabot.yml # .github/workflows/ci.yml # .github/workflows/format.yml # .github/workflows/labeler.yml # .github/workflows/pip.yml # docs/changelog.rst # include/pybind11/detail/common.h # include/pybind11/pytypes.h # pybind11/_version.py
RobotLocomotion · Jun 18, 2024 · f6d95d8 · f6d95d8
2 parents 1f8e0c3 + 3e9dfa2
commit f6d95d8
Show file tree

Hide file tree

Showing 87 changed files with 2,320 additions and 571 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -135,7 +135,7 @@ The valid options are:
 * Use `-G` and the name of a generator to use something different. `cmake
   --help` lists the generators available.
       - On Unix, setting `CMAKE_GENERATER=Ninja` in your environment will give
-        you automatic mulithreading on all your CMake projects!
+        you automatic multithreading on all your CMake projects!
 * Open the `CMakeLists.txt` with QtCreator to generate for that IDE.
 * You can use `-DCMAKE_EXPORT_COMPILE_COMMANDS=ON` to generate the `.json` file
   that some tools expect.