Skip to content

Commit

Permalink
Merge 'upstream/v2.12.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
EricCousineau-TRI authored Jun 18, 2024
2 parents 1f8e0c3 + f6d95d8 commit ef4e178
Show file tree
Hide file tree
Showing 87 changed files with 2,320 additions and 571 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit ef4e178

Please sign in to comment.