Skip to content

Glue rebase 2 - #5721

Merged
zonkmachine merged 1 commit into
LMMS:masterfrom
zonkmachine:glueRebase
Oct 19, 2020
Merged

zonkmachine merged 1 commit into
LMMS:masterfrom
zonkmachine:glueRebase

Conversation

@zonkmachine

Copy link
Copy Markdown
Contributor

Manually rebasing #5482 on top of master and fixing up the commit message.

Replaces #5482

@LmmsBot

LmmsBot commented Oct 18, 2020 •

Copy link
Copy Markdown
🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩

Linux

Windows

macOS

🤖
{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://9653-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-733%2Bg32de995-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/9653?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://9654-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-733%2Bg32de99518-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/9654?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://9650-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-733%2Bg32de99518-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/9650?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/34010402u34uro89/artifacts/build/lmms-1.2.2-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/35816490"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/ahxh1s5msj9gfj01/artifacts/build/lmms-1.2.2-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/35816490"}], "macOS": [{"artifact": {"title": {"title": "", "platform_name": "macOS"}, "link": {"link": "https://9651-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-733%2Bg32de99518-mac10.13.dmg"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/9651?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}]}, "commit_sha": "44c1bd9c22f276077b0f84f812573cf34399eb90"}

@zonkmachine

Copy link
Copy Markdown
Contributor Author

OK. The code hasn't changed from #5482 and I've taken it for a last test run. Merging.

Tool to glue selected notes together. Selected notes that are
adjacent to each other or overlapping are transformed into one note
stretching over the combined notes on/off times.

Key command: <Shift> + G

Partially fixes: LMMS#746 which is part of LMMS#4877

Co-authored-by: Hyunjin Song <tteu.ingog@gmail.com>
Co-authored-by: IanCaio <iancaio_dev@hotmail.com>
Co-authored-by: Spekular <Spekularr@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com>
@zonkmachine
zonkmachine merged commit acd0e4d into LMMS:master Oct 19, 2020
@zonkmachine

Copy link
Copy Markdown
Contributor Author

The whole point with this whole rebase was to change the ownership back to the original author, CYBERDEViLNL.
I failed miserably at this and now he's the only one who isn't mentioned in the final commit. Disappointed...

@tresf tresf mentioned this pull request Feb 26, 2021
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
Tool to glue selected notes together. Selected notes that are
adjacent to each other or overlapping are transformed into one note
stretching over the combined notes on/off times.

Key command: <Shift> + G

Partially fixes: LMMS#746 which is part of LMMS#4877

Co-authored-by: Hyunjin Song <tteu.ingog@gmail.com>
Co-authored-by: IanCaio <iancaio_dev@hotmail.com>
Co-authored-by: Spekular <Spekularr@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com>
@zonkmachine
zonkmachine deleted the glueRebase branch May 25, 2024 10:19
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.

2 participants