diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-02-03 22:30:10 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-02-03 22:30:10 +0100 |
| commit | 0ade95f9f68485eb3bca1db571bbe38a851d4345 (patch) | |
| tree | ea46c191f486b3e93323cca8f78a1a8241f9c0d4 /CHANGELOG.md | |
| parent | a0f0a40790e123d58f8806790655cc13aea98227 (diff) | |
| parent | fb5dfa2bf940f30a8354ec8f0010419fa3ba494f (diff) | |
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git
# Conflicts:
# CHANGELOG
# src/preferences/dialog/dlgprefrecord.cpp
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ca52d1317b..24e77e5ae7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ## [2.2.4](https://launchpad.net/mixxx/+milestone/2.2.4) (Unreleased) +* Store default recording format after "Restore Defaults" lp:1857806 #2414 * Prevent infinite loop when decoding corrupt MP3 files #2417 * Add workaround for broken libshout versions #2040 #2438 * Speed up purging of tracks lp:1845837 #2393 |