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

fix(util): hotcuecolor palettes constant name #11048

Merged
merged 1 commit into from
Nov 8, 2022
Merged

fix(util): hotcuecolor palettes constant name #11048

merged 1 commit into from
Nov 8, 2022

Conversation

Swiftb0y
Copy link
Member

@Swiftb0y Swiftb0y commented Nov 7, 2022

found this while looking into #11045

@daschuer
Copy link
Member

daschuer commented Nov 8, 2022

Before:
constexpr mixxx::RgbColor kColorMixxxYellow(#32BE44);
constexpr mixxx::RgbColor kColorMixxxGreen(#42D4F4);
constexpr mixxx::RgbColor kColorMixxxCeleste(#F8D200);

After
constexpr mixxx::RgbColor kColorMixxxGreen(#32BE44);
constexpr mixxx::RgbColor kColorMixxxCeleste(#42D4F4);
constexpr mixxx::RgbColor kColorMixxxYellow(#F8D200);

The 2.3 branch is also affected. Can you rebase this accordingly?

@Swiftb0y Swiftb0y force-pushed the fixup-hotcue-palette-colors branch from 512d85d to e094177 Compare November 8, 2022 09:09
@Swiftb0y Swiftb0y changed the base branch from main to 2.3 November 8, 2022 09:09
@Swiftb0y
Copy link
Member Author

Swiftb0y commented Nov 8, 2022

rebased onto 2.3

daschuer
daschuer approved these changes Nov 8, 2022
View reviewed changes
Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

Thank you.

@daschuer daschuer merged commit 867877f into mixxxdj:2.3 Nov 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daschuer daschuer daschuer 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.
2 participants
@Swiftb0y @daschuer