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

Conflicts: CHANGELOG src/defs_version.h
daschuer · Feb 3, 2019 · 5cb57df · 5cb57df
2 parents 1e19340 + 6defdf3
commit 5cb57df
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -30,6 +30,14 @@ Miscellaneous
   scrolling waveforms.
 * Support IRC/AIM/ICQ broadcast metadata.
 
+==== 2.1.7 2019-01-15 ====
+
+* Fix syncing to doublespeed lp:1808697
+* 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 	
+
 ==== 2.1.6 2018-12-23 ====
 
 * Fix crash when loading a Qt5 Soundsource / Vamp Plug-In. lp:1774639 * Validate effect parameter range. lp:1795234

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,8 +1,14 @@
+mixxx (2.1.7-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release  
+
+ -- Daniel Schürmann <daschuer@mixxx.org>  Mon, 14 Jan 2019 00:08:23 +0100
+
 mixxx (2.1.6-0ubuntu1) bionic; urgency=medium
 
   * New upstream release
 
- -- Daniel <daniel@daniel-530U3C-530U4C-532U3C>  Sun, 23 Dec 2018 11:01:23 +0100
+ -- Daniel Schürmann <daschuer@mixxx.org>  Sun, 23 Dec 2018 11:01:23 +0100
 
 mixxx (2.1.4-0ubuntu1) bionic; urgency=medium