Skip to content

Merge master into develop#6484

Merged
omichel merged 3 commits intodevelopfrom
sync-master-3c3f84995
Jan 19, 2024
Merged

Merge master into develop#6484
omichel merged 3 commits intodevelopfrom
sync-master-3c3f84995

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Synchronizes changes of master branch into develop branch.

omichel and others added 2 commits January 18, 2024 08:18
* Fixing missing libcar.dylib and libdriver.dylib on MacOS when using extern controller.

These dylibs are located at `Contents/lib/controller`. However, the code is looking for them in `Contents/MacOS/lib/controller`. Removing the extra `.../MacOS/...` from the path fixes the issue.

* Update changelog-r2023.md

* Update changelog-r2023.md

---------

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
@github-actions github-actions Bot requested a review from a team as a code owner January 19, 2024 04:05
@omichel omichel self-assigned this Jan 19, 2024
@omichel omichel added the synchronization Synchronization of branches label Jan 19, 2024
@omichel omichel merged commit a811190 into develop Jan 19, 2024
@omichel omichel deleted the sync-master-3c3f84995 branch January 19, 2024 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

synchronization Synchronization of branches

Development

Successfully merging this pull request may close these issues.

2 participants