Skip to content

Conversation

@sakertooth
Copy link
Contributor

@sakertooth sakertooth commented Aug 5, 2024

I realized we merged the MixerChannelView addition, but the formatting wasn't correct.

Copy link
Contributor

@Rossmaxx Rossmaxx left a comment

Choose a reason for hiding this comment

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

This is it for now.

@sakertooth sakertooth changed the title Reformat MixerChannelView.cpp and MixerChannelView.h Fix up MixerChannelView Sep 14, 2024
@sakertooth sakertooth marked this pull request as draft September 17, 2024 17:44
@sakertooth sakertooth marked this pull request as ready for review September 17, 2024 17:56
@sakertooth sakertooth force-pushed the reformat-mixer-channel-view branch from 7271f28 to 45a5c7b Compare September 17, 2024 18:01
@sakertooth sakertooth changed the title Fix up MixerChannelView Tidy up MixerChannelView Sep 17, 2024
Copy link
Contributor

@Rossmaxx Rossmaxx left a comment

Choose a reason for hiding this comment

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

About time we merge minor PRs like this.

@Rossmaxx
Copy link
Contributor

@sakertooth merge master and we good.

@sakertooth
Copy link
Contributor Author

These merge conflicts are too risky to deal with (already got segfaults when trying to merge master), so I'm starting over.

@sakertooth
Copy link
Contributor Author

I'm splitting the functional changes I made here into another PR. This PR will just be fixing the formatting since that was the main issue I had with these two files.

@sakertooth sakertooth force-pushed the reformat-mixer-channel-view branch from 45a5c7b to 4bab381 Compare September 30, 2024 23:28
@sakertooth sakertooth changed the title Tidy up MixerChannelView Reformat MixerChannelView files Sep 30, 2024
@sakertooth sakertooth merged commit 860749a into LMMS:master Sep 30, 2024
@sakertooth sakertooth deleted the reformat-mixer-channel-view branch September 30, 2024 23:32
mmeeaallyynn pushed a commit to mmeeaallyynn/lmms that referenced this pull request Oct 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants