Merge 6 -> 7 (Partial merge forward) #1026
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Martin Pecka <[email protected]>
iche033
force-pushed
the
merge_6_7_partial_20240731
branch
from
55f9382 to
7d4b012
Compare
ahcorde
approved these changes
Aug 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Forward port #994 and
#1017fromign-rendering6togz-rendering7There are many conflicts between
ign-rendering6andgz-rendering7due to ogre-next version upgrade and ign -> gz renaming. I manually cherry-pickeda couple ofone commits in this forward port.I did not forward port these changes
gz-rendering8Branch comparison: gz-rendering7...ign-rendering6
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)