muse-sequencer / muse

MusE is a digital audio workstation with support for both Audio and MIDI
https://muse-sequencer.github.io/
Other
634 stars 67 forks source link

Merge from master #1280

Closed terminator356 closed 1 month ago

terminator356 commented 1 month ago

Anticipating upcoming major changes to master, seemed best to update this important branch first.

terminator356 commented 1 month ago

Ehm... Testing GitHub merge. You can approve if you like but I'm actually trying to make GitCola merge locally here instead of using GitHub merge, but GitCola always gives me trouble - nothing happens and no warnings or output. Hmm.. What was that correct command again...

terminator356 commented 1 month ago

Duh! Forgot to pull from master before merging, so git thinks my branch is up to date - with an old local master.

Gets me every time! Ha ha.

spamatica commented 1 month ago

Hehe, yeah, git is an experience. Looking forward to testing!