Merge remote-tracking branch 'upstream/2.2' into touchfix

mixxxdj · Oct 31, 2020 · 8563d47 · 8563d47
2 parents e70ea15 + 4ac7d04
commit 8563d47
Show file tree

Hide file tree

Showing 5 changed files with 600 additions and 477 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,6 +9,7 @@
 * Prevent moving a loop beyond track end #3117 lp:1799574
 * Use 6 instead of only 4 compatible musical keys (major/minor) #3205
 * Fix possible memory corruption using JACK on Linux
+* Fix possible crash when trying to refocus the tracks table while another Mixxx window has focus #3201
 * Fix touch control lp:1895431
 
 ==== 2.2.4 2020-05-10 ====