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

Fixed #3443. Added and fixed mixer automation labels. #3453

Merged
merged 1 commit into from
Mar 26, 2017
Merged

Fixed #3443. Added and fixed mixer automation labels. #3453

merged 1 commit into from
Mar 26, 2017

Conversation

karmux
Copy link
Contributor

@karmux karmux commented Mar 24, 2017

No description provided.

@Umcaruje Umcaruje changed the base branch from master to stable-1.2 March 26, 2017 11:31
@Umcaruje
Copy link
Member

Changed the PR to address stable-1.2

Umcaruje
Umcaruje approved these changes Mar 26, 2017
View reviewed changes
Copy link
Member

@Umcaruje Umcaruje left a comment

Choose a reason for hiding this comment

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

This fixes the issue and works nice 👍

One thing is that I would have spaces around all these brackets, but that should be handled in a separate PR, as this is consistent with the codebase rn.

Merging.

@Umcaruje Umcaruje merged commit 4dc5d14 into LMMS:stable-1.2 Mar 26, 2017
@jasp00
Copy link
Member

jasp00 commented Mar 28, 2017

Changed the PR to address stable-1.2

How does work flow? Another PR to master?

@Umcaruje
Copy link
Member

The way this happened for 1.1 is that we had people just periodically merge the new changes in the stable branch back to master.

@tresf
Copy link
Member

tresf commented Mar 28, 2017

How does work flow? Another PR to master?

No, the admins generally handle this by doing occasional (e.g. weekly) syncs between stable-1.2 and master.

@karmux karmux deleted the 3443_mixer_automation_labels branch March 28, 2017 22:16
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@karmux @Umcaruje
Fixed LMMS#3443. Added and fixed mixer automation labels. (LMMS#3453)
e3609b9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Umcaruje Umcaruje Umcaruje 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.
4 participants
@karmux @Umcaruje @jasp00 @tresf