summaryrefslogtreecommitdiffstats
path: root/build/debian
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2019-01-12 23:14:20 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2019-01-12 23:14:20 +0100
commit5c0261a9c3cf23cc164f259a131f59f25b87cb03 (patch)
tree01f8f05f48c56bbf7a6570f17ab9ca60849ed34b /build/debian
parentdd5de6b1ab592910e1f06f1b66fe170da94cf271 (diff)
parent1f6d795252d0454962d1ae4dd284d100e6f4180f (diff)
Merge remote-tracking branch 'upstream/2.2'
Conflicts: CHANGELOG.md LICENSE build/wix/LICENSE.rtf src/defs_version.h src/engine/controls/ratecontrol.cpp
Diffstat (limited to 'build/debian')
-rw-r--r--build/debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/build/debian/changelog b/build/debian/changelog
index 7be287a008..435098f0d8 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,3 +1,9 @@
+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
+
mixxx (2.1.4-0ubuntu1) bionic; urgency=medium
* New upstream release.