Merge remote-tracking branch 'upstream/2.2' into release_2.2.1

1 files changed, 17 insertions, 8 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e226920ba3..94ffb8c4df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,12 @@
 ==== 2.2.1 2019-02-02 ====
 
-* Include all fixed from Mixxx 2.1.7 
+* Include all fixed from Mixxx 2.1.7 and 2.1.8
 * Fix high CPU usage on MAC due to preview column lp:1812763
 * Fix HID controller output on Windows with common-hid-packet-parser.js
 * Fix rendering slow down by not using QStylePainter in WSpinny lp:1530720
 * Fix broken Mic mute button lp:1782568
 * added quick effect enable button to the control picker menu
+* Fix Cover Window close issue with empty cover arts
 
 ==== 2.2.0 2018-12-17 ====
 
@@ -39,33 +40,41 @@ Miscellaneous
   scrolling waveforms.
 * Support IRC/AIM/ICQ broadcast metadata.
 
+==== 2.1.8 2019-04-07 ====
+
+* Fix a rare chance for a corrupt track file while writing metadata in out of disk situations. lp:1815305
+* Fix export of BPM track file metadata. lp:1816490
+* Fix sending of broadcast metadata with TLS enabled libshout 2.4.1. lp:1817395
+* Fix resdicovering purged tracks in all cases. lp:1821514
+* Fix dropping track from OSX Finder. lp:1822424
+
 ==== 2.1.7 2019-01-15 ====
 
 * Fix syncing to doublespeed lp:1808697
-* Fix issues when changing beats of a synced track lp:1808698 
+* Fix issues when changing beats of a synced track lp:1808698
 * Fix direction of pitch bend buttons when inverting rate slider lp:1770745
 * Use first loaded deck if no playing deck is found lp:1784185
-* Encode file names correctly on macOS lp:1776949 	
+* Encode file names correctly on macOS lp:1776949
 
 ==== 2.1.6 2018-12-23 ====
 
 * Fix crash when loading a Qt5 Soundsource / Vamp Plug-In. lp:1774639 * Validate effect parameter range. lp:1795234
 * Fix crash using the bpm_tap button without a track loaded. lp:1801844
-* Fix possible crash after ejecting a track. lp:1801874 	
+* Fix possible crash after ejecting a track. lp:1801874
 * Fix wrong bitrate reported for faulty mp3 files. lp:1782912
 * Fix Echo effect syncing lp:1793232
 * Fix iTunes context menu lp:1799932
 * Fix loading the wrong track after delete search and scroll. lp:1803148
 * Improve search bar timing. lp:1635087
-* Fix quoted search sentence. lp:1784141 
-* Fix loading a track formerly not existing. lp:1800395 
+* Fix quoted search sentence. lp:1784141
+* Fix loading a track formerly not existing. lp:1800395
 * Fix imporing m3u files with blank lines. lp:1806271
 * Fix position in sampler overview waveforms. lp:1744170
-* Don't reset rate slider, syncing a track without a beatgrid. lp:1783020 	
+* Don't reset rate slider, syncing a track without a beatgrid. lp:1783020
 * Clean up iTunes track context menu. lp:1800335
 * Collapsed sampler are not analyzed on startup. lp:1801126
 * search for decoration characters like "˚". lp:#1802730
-* Fix cue button blinking after pressing eject on an empty deck. lp:1808222 	
+* Fix cue button blinking after pressing eject on an empty deck. lp:1808222
 
 ==== 2.1.5 2018-10-28 ====