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 ign-physics2 ➡️ ign-physics5 #489

Merged
merged 3 commits into from
Mar 15, 2023
Merged

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port ign-physics2 ➡️ ign-physics5

Branch comparison: ign-physics5...ign-physics2

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

The LICENSE file contained a copy of the stanze
used at the top of source code files, while the
actual license was in the COPYING file. So remove
the stanza and put the actual Apache 2.0 license text
in LICENSE.

Similar to gazebosim/gz-math#521.

Signed-off-by: Steve Peters <[email protected]>
Version v2 of the actions/checkout workflow is
deprecated, so switch to v3.

Part of gazebo-tooling/release-tools#862.

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested review from azeey and mxgrey as code owners March 14, 2023 22:49
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Mar 14, 2023
@mjcarroll mjcarroll merged commit 4856580 into ign-physics5 Mar 15, 2023
@mjcarroll mjcarroll deleted the scpeters/merge_2_5 branch March 15, 2023 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants