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

Update macOS-Development-Setup.rst #3758

Merged
merged 1 commit into from
Jun 30, 2023
Merged

Conversation

PhDittmann
Copy link
Contributor

  • add Xcode App Store link
  • BASH -> ZSH (default)
  • make homebrew paths generic

Copy link
Member

@audrow audrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested this locally, but these changes look good to me.

I suggested one small change.

I also think this PR should target rolling and then be backported to Iron and Humble (if relevant).

@@ -29,7 +29,7 @@ You need the following things installed to build ROS 2:
#.
**Xcode**

* If you don't already have it installed, install Xcode.
* If you don't already have it installed, install [Xcode](https://apps.apple.com/de/app/xcode/id497799835).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* If you don't already have it installed, install [Xcode](https://apps.apple.com/de/app/xcode/id497799835).
* If you don't already have it installed, install [Xcode](https://apps.apple.com/app/xcode/id497799835).

This also works but doesn't link to xcode in German, I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. I removed the locale and pushed it again.

These changes should also work for the other versions.

@audrow audrow self-assigned this Jun 29, 2023
@audrow audrow changed the base branch from iron to rolling June 29, 2023 21:58
@audrow
Copy link
Member

audrow commented Jun 29, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Jun 29, 2023

rebase

✅ Branch has been successfully rebased

@audrow
Copy link
Member

audrow commented Jun 29, 2023

@PhDittmann I retargeted this PR to rolling and tried rebasing it since there were a bunch of unnecessary commits. Can you fix this, maybe by cherry-picking your commit onto rolling and then pushing to this branch? Otherwise, I can do it, but I may be slower to get to it.

@PhDittmann
Copy link
Contributor Author

I stashed my commit, pulled the latest official rolling and put it on top of it.

    - add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic
@clalancette clalancette added the backport-all backport at reviewers discretion; from rolling to all versions label Jun 30, 2023
@clalancette clalancette merged commit 15260f5 into ros2:rolling Jun 30, 2023
mergify bot pushed a commit that referenced this pull request Jun 30, 2023
- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
(cherry picked from commit 15260f5)
mergify bot pushed a commit that referenced this pull request Jun 30, 2023
- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
(cherry picked from commit 15260f5)

# Conflicts:
#	source/Installation/Alternatives/macOS-Development-Setup.rst
clalancette pushed a commit that referenced this pull request Jun 30, 2023
- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
(cherry picked from commit 15260f5)

# Conflicts:
#	source/Installation/Alternatives/macOS-Development-Setup.rst
clalancette pushed a commit that referenced this pull request Jun 30, 2023
- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
(cherry picked from commit 15260f5)

Co-authored-by: PhDittmann <dittmann@tzi.de>
clalancette pushed a commit that referenced this pull request Jun 30, 2023
- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
(cherry picked from commit 15260f5)
ygoumaz added a commit to cyberbotics/ros2_documentation that referenced this pull request Jul 11, 2023
* Update launch files to declare WebotsController node (#11) (ros2#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (ros2#3764)

* new tutorial

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

* Update macOS-Development-Setup.rst (ros2#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (ros2#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (ros2#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
audrow pushed a commit that referenced this pull request Jul 26, 2023
* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

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

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
mergify bot pushed a commit that referenced this pull request Jul 26, 2023
* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

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

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 69be724)
mergify bot pushed a commit that referenced this pull request Jul 26, 2023
* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

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

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 69be724)

# Conflicts:
#	source/Tutorials/Advanced/Simulators/Webots/Simulation-Webots.rst
audrow pushed a commit that referenced this pull request Jul 26, 2023
* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

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

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 69be724)

Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
audrow added a commit that referenced this pull request Jul 26, 2023
* Enhancement Add Ros2Supervisor tutorial (#3790)

* Sync fork (#17)

* Update launch files to declare WebotsController node (#11) (#3763)

* change launch files

* Update Setting-Up-Simulation-Webots-Basic.rst

* update minimal version tutorial 2

* add upcoming versions

* New Reset Handler tutorial (#12) (#3764)

* new tutorial

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

* Update macOS-Development-Setup.rst (#3758)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>

* Change confusing title between Debian package and Debian platform (#3771)

Currently Debian does not offer ROS2 packages. Change the title that can
be confusing.

* Make the calendar more mobile-friendly. (#3774)

* Make the calendar more mobile-friendly.

When looking at some of the analytics, it looks like this
page is particularly not mobile friendly.  That's because
the Google calendar embedded on the bottom of the page
is of fixed with 800x600, which doesn't work well on
many mobile devices.

What we do here is to see if a device has 767 or less pixels.
If it does, then we just show the agenda, which fits in just
280 pixels.  If we have more than that, we have room for
the full monthly agenda, so we show the full thing.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* add new tutorial

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst

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

* Update Simulation-Supervisor.rst

* minor

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
Co-authored-by: PhDittmann <dittmann@tzi.de>
Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
Co-authored-by: Quentin Quadrat <lecrapouille@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 69be724)

# Conflicts:
#	source/Tutorials/Advanced/Simulators/Webots/Simulation-Webots.rst

* Fix merge conflict

Signed-off-by: GitHub <noreply@github.com>

---------

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
Co-authored-by: Audrow Nash <audrow@openrobotics.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-all backport at reviewers discretion; from rolling to all versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants