mscore/importmidi/importmidi.cpp | 9 6 + 3 - 0 !
1 file changed, 6 insertions(+), 3 deletions(-)

 fix #324388 negative midi-time

mscore/importmidi/importmidi_lyrics.cpp | 23 2 + 21 - 0 !
1 file changed, 2 insertions(+), 21 deletions(-)

 fix #326259: keep kar format on import
 i.e. don't remove slashes from lyrics on MIDI import
 .
 Those slashes are apparently used by Karaoke software to show one phrase
 (delimited by those slashes) at a time. They don't really harm in
 MuseScore, but are needed/wanted for MIDI export including
 (which MuseScore can't do currently, but an external tool can, see
 https://github.com/juerg-mueller/InsertLyrics) and the lyrics most
 probably need to get amended anyway (to add lyrics dashes and melismas)

mscore/preferences.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix #321074: pitch bend sounds incorrectly when export to midi

libmscore/lyricsline.cpp | 12 6 + 6 - 0 !
1 file changed, 6 insertions(+), 6 deletions(-)

 eng-58: fix melisma y position
 This commit fixes a very subtle error in the y-positioning of melisma
 lines on lyrics under rests (a rare situation as-is). In short, the
 equation for the y-position was ignoring the y-position and y-offset of
 the lyric's chordrest. In normal circumstances (when a lyric is under a
 chord), this value is 0, so the bug doesn't present itself until one
 attempts to put melismas under rests (which is hard to do in the first
 place, but does occur in some XML imports).

libmscore/beam.cpp | 1 1 + 0 - 0 !
libmscore/lyrics.cpp | 1 1 + 0 - 0 !
libmscore/ottava.cpp | 3 2 + 1 - 0 !
libmscore/scoreElement.cpp | 25 21 + 4 - 0 !
libmscore/scoreElement.h | 1 1 + 0 - 0 !
libmscore/textbase.cpp | 4 2 + 2 - 0 !
6 files changed, 28 insertions(+), 7 deletions(-)

 fix crash in some files
 where getPropertyStyle(spp.pid) returns Sid::NOSTYLE
 .
 replace styleValue(x, getPropertyStyle(x)) with safePropertyStyleValue(x)
 .
 Also note what must be initialised before calling initElementStyle
 and actually do that for these cases I could identify in 3.2.3

awl/styledslider.h | 4 2 + 2 - 0 !
fluid/fluid.cpp | 18 12 + 6 - 0 !
fluid/voice.cpp | 10 10 + 0 - 0 !
mscore/scoreview.h | 4 2 + 2 - 0 !
4 files changed, 26 insertions(+), 10 deletions(-)

 hopefully fix some more uninitialised accesses

mscore/pianolevelsfilter.h | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 allow offtime past nominal note length in pre
 (this already works when editing the MSCX XML manually)
 .
 Not applicable upstream since commit e6ec376a0728ada5833824
 changed to a fraction-based measurement system.

fluid/sfont.cpp | 87 67 + 20 - 0 !
fluid/sfont.h | 6 4 + 2 - 0 !
fluid/sfont3.cpp | 55 37 + 18 - 0 !
fluid/voice.cpp | 45 22 + 23 - 0 !
fluid/voice.h | 8 4 + 4 - 0 !
5 files changed, 134 insertions(+), 67 deletions(-)

 fix multiple possible causes of crashes or audible artefacts
 - Track sample name so we can issue proper warning messages, show filename
 - On read errors, issue an error message and mark sample as invalid
 - Mark sample as invalid if Ogg Vorbis decompression (SF3) fails
 - Do all sanity checks on {,loop}{start,end} with SF2 semantics for end;
   only switch end to point to the last sample afterwards in only one place
 - Adapt sanity checks and corrections to current FluidSynth, which matches
   real-existing soundfonts better
 - Add sanity check provided by the SoundFont spec as extra diagnostic
 - Do not crash if there is no data[]
 - Issue diagnostics if disabling a sample
 - Swap two members to improve structure packing/alignment while there
 - Use unsigned integers for SoundFont element sizes properly

libmscore/element.cpp | 49 49 + 0 - 0 !
libmscore/element.h | 2 2 + 0 - 0 !
mscore/scoreaccessibility.cpp | 48 8 + 40 - 0 !
mscore/scoreaccessibility.h | 1 0 + 1 - 0 !
4 files changed, 59 insertions(+), 41 deletions(-)

 add element::barbeat() and element::accessiblebarbeat()
 These are const, and useful for determining the positions of elements

libmscore/rendermidi.cpp | 2 1 + 1 - 0 !
mscore/exportmidi.cpp | 9 0 + 9 - 0 !
mscore/seq.cpp | 33 10 + 23 - 0 !
mtest/libmscore/midi/tst_midi.cpp | 2 0 + 2 - 0 !
synthesizer/event.cpp | 24 17 + 7 - 0 !
synthesizer/event.h | 7 1 + 6 - 0 !
6 files changed, 29 insertions(+), 48 deletions(-)

 revert the unison restriking patch
 The restriking patch went into 2.2 (and up), 3.x, and master,
 while it is not unquestioned. It was never meant to last; MIDI
 channel assignment to individual voices must be made user-friendly,

synthesizer/event.cpp | 31 31 + 0 - 0 !
1 file changed, 31 insertions(+)

 log unison collisions (that would otherwise be restruck)

libmscore/rendermidi.cpp | 1 0 + 1 - 0 !
libmscore/repeatlist.cpp | 2 1 + 1 - 0 !
libmscore/system.cpp | 2 0 + 2 - 0 !
libmscore/undo.cpp | 1 0 + 1 - 0 !
libmscore/xmlreader.cpp | 5 4 + 1 - 0 !
5 files changed, 5 insertions(+), 6 deletions(-)

 remove a few debug statements run for us
 and do something with some