Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop #6252

Merged
merged 2 commits into from
Jun 26, 2023
Merged

Merge master into develop #6252

merged 2 commits into from
Jun 26, 2023

Conversation

github-actions[bot]
Copy link
Contributor

Synchronizes changes of master branch into develop branch.

Benjamin Délèze and others added 2 commits June 23, 2023 11:11
* blog post

* fix typos

* fix style

* upper case

* Update menu.md

* typo

* include new devices

* Update changelog-r2023.md

* Update index.md

* added controller launcher + ros2

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

* update date

* Update Webots-2023-b-release.md

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update docs/blog/Webots-2023-b-release.md

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

---------

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: Yannick Goumaz <yannick.goumaz@epfl.ch>
Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>
* Remove sumo from Webots package

* Update documentation

* Update the instructions

* Update instructions for macOS and Windows

* Remove code related to bundled sumo

* update sumo installation directory path

* Update the documentation

* Remove last occurrences of Webots sumo folder

* Remove references to deleted Makefile

* Update sumo-interface.md

* Update sumo_supervisor.py

* Update sumo-interface.md

---------

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
@github-actions github-actions bot requested a review from a team as a code owner June 24, 2023 04:05
@BenjaminDeleze BenjaminDeleze added synchronization Synchronization of branches test sources Start the sources test on all platforms labels Jun 26, 2023
@BenjaminDeleze BenjaminDeleze self-assigned this Jun 26, 2023
@BenjaminDeleze BenjaminDeleze merged commit 180eee7 into develop Jun 26, 2023
164 of 170 checks passed
@BenjaminDeleze BenjaminDeleze deleted the sync-master-a852ffbad branch June 26, 2023 06:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
synchronization Synchronization of branches test sources Start the sources test on all platforms
Development

Successfully merging this pull request may close these issues.

2 participants