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.

Sign up for GitHub

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

Jump to bottom

Merge stabilization/2210 to development #516

Merged
merged 2 commits into from
Sep 21, 2022
Merged

Merge stabilization/2210 to development #516

merged 2 commits into from
Sep 21, 2022

Conversation

AMZN-daimini
Copy link
Contributor

No conflicts

rgba16f and others added 2 commits September 7, 2022 12:49
@rgba16f
Add Debug::Tracer tracer stack variable to main so that TraceMessag…
6e9e09c 
…eBus works (o3de#503) (o3de#505)

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
@AMZN-daimini
Merge commit '6e9e09cabd0193b1dc69aa3ddefdc8a04dad7eca' into daimini/…
e716e08 
…gitflow_220921_atomsampleviewer
@AMZN-daimini AMZN-daimini requested review from a team September 21, 2022 18:35
@rgba16f
Copy link
Contributor

rgba16f commented Sep 21, 2022

Looks like no code changes to merge?

@cgalvan
Copy link
Contributor

cgalvan commented Sep 21, 2022

Looks like no code changes to merge?

Correct, because the original commit was later cherry-picked into the stabilization branch:

#505

@AMZN-daimini
Copy link
Contributor Author

Right, I didn't even notice... I can submit it just to update the history, or wait until the next sync merge?

@AMZN-daimini
Copy link
Contributor Author

Decided to submit so history is preserved.

@AMZN-daimini AMZN-daimini merged commit 91a443f into o3de:development Sep 21, 2022
@AMZN-daimini AMZN-daimini deleted the daimini/gitflow_220921_atomsampleviewer branch September 21, 2022 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gadams3 gadams3 gadams3 approved these changes

@galibzon galibzon galibzon approved these changes

@cgalvan cgalvan cgalvan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@AMZN-daimini @rgba16f @cgalvan @galibzon @gadams3