diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-12-30 23:33:47 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-12-30 23:33:47 +0100 |
| commit | 7d3fd5d315272623f1425a7b437257852e7ea0b5 (patch) | |
| tree | 40c8cc7b5e90a4df41beaf660f46cc8658eece7d /CHANGELOG.md | |
| parent | d3b0082f82d0cafa144f75c083829db4c14c517b (diff) | |
| parent | 003ca9986a24adacf0d50bf96c3ca92b3d6eb58b (diff) | |
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f5a3e09c9..0d8edb9885 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,12 @@ * Add Opus streaming and recording support. [lp:1338413](https://bugs.launchpad.net/mixxx/+bug/1338413) * Add mapping for Roland DJ-505 +## [2.2.4](https://launchpad.net/mixxx/+milestone/2.2.4) (Unreleased) + +* Prevent infinite loop when decoding corrupt MP3 files #2417 + ## [2.2.3](https://launchpad.net/mixxx/+milestone/2.2.3) (2019-11-24) -==== 2.2.3 2019-11-24 ==== * Don't make users reconfigure sound hardware when it has not changed #2253 * Fix MusicBrainz metadata lookup lp:1848887 #2328 * Fix high DPI scaling of cover art #2247 |