diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2019-08-12 21:45:23 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2019-08-12 21:45:23 +0200 |
commit | fdc6f55751185e1669d578a4d5fcd1a5cd32567d (patch) | |
tree | c010a114424b9e65e8043aea8b829e32d49ec54c /CHANGELOG.md | |
parent | 2e9c17e1e4c360776c5f356fe3893d7a9ba9cc53 (diff) | |
parent | 8a94cf57d07e3ce2397ea96724d7c6130aa74eff (diff) |
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git
# Conflicts:
# CHANGELOG.md
# build/depends.py
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a4ab1296ec..fbec5952b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ * Add Opus streaming and recording support. [lp:1338413](https://bugs.launchpad.net/mixxx/+bug/1338413) * Add mapping for Roland DJ-505 -## [2.2.2](https://launchpad.net/mixxx/+milestone/2.2.2) (2019-08-08) +## [2.2.2](https://launchpad.net/mixxx/+milestone/2.2.2) (2019-08-10) * Fix battery widget with upower <= 0.99.7. #2221 * Fix BPM adjust in BpmControl. lp:1836480 @@ -29,6 +29,7 @@ * Fix FX1/2 buttons missing Mic unit in Deere (64 samplers). lp:1837716 * Tango64: Re-enable 64 samplers. #2223 * Numark DJ2Go re-enable note-off for deck A cue button. #2087 +* Replace Flanger with QuickEffect in keyboard mapping. #2233 ## [2.2.1](https://launchpad.net/mixxx/+milestone/2.2.1) (2019-04-22) |