summaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-10-29 17:00:39 +0100
committerUwe Klotz <uklotz@mixxx.org>2020-10-29 17:00:39 +0100
commit83b7eb56cdf986e9f962205c1315148f83f528ed (patch)
treee5f8677104a762dfe78d1a0a4c1dfc9081542865 /CHANGELOG.md
parent357b5a077435a761e4e0ede4ce08b32725c8679f (diff)
parent4ac7d04f4ab5a972f64d7f66c3b69d56fcffecbf (diff)
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3
# Conflicts: # CHANGELOG
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5427b9bc1f..946fd50af8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
* Prevent moving a loop beyond track end [#3117](https://github.com/mixxxdj/mixxx/pull/3117) [lp:1799574](https://bugs.launchpad.net/mixxx/+bug/1799574)
* Use 6 instead of only 4 compatible musical keys (major/minor) [#3205](https://github.com/mixxxdj/mixxx/pull/3205)
* Fix possible memory corruption using JACK on Linux [#3160](https://github.com/mixxxdj/mixxx/pull/3160)
+* Fix possible crash when trying to refocus the tracks table while another Mixxx window has focus [#3201](https://github.com/mixxxdj/mixxx/pull/3201)
## [2.2.4](https://launchpad.net/mixxx/+milestone/2.2.4) (2020-06-27)