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

Merged
merged 1 commit into from Mar 26, 2017

Conversation

Projects
None yet
4 participants
@karmux
Contributor

karmux commented Mar 24, 2017

No description provided.

@Umcaruje Umcaruje changed the base branch from master to stable-1.2 Mar 26, 2017

@Umcaruje

This comment has been minimized.

Show comment
Hide comment
@Umcaruje

Umcaruje Mar 26, 2017

Member

Changed the PR to address stable-1.2

Member

Umcaruje commented Mar 26, 2017

Changed the PR to address stable-1.2

@Umcaruje

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

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jasp00

This comment has been minimized.

Show comment
Hide comment
@jasp00

jasp00 Mar 28, 2017

Member

Changed the PR to address stable-1.2

How does work flow? Another PR to master?

Member

jasp00 commented Mar 28, 2017

Changed the PR to address stable-1.2

How does work flow? Another PR to master?

@Umcaruje

This comment has been minimized.

Show comment
Hide comment
@Umcaruje

Umcaruje Mar 28, 2017

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.

Member

Umcaruje commented Mar 28, 2017

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

This comment has been minimized.

Show comment
Hide comment
@tresf

tresf Mar 28, 2017

Member

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.

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 karmux:3443_mixer_automation_labels branch Mar 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment