diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-01-12 16:45:28 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-01-12 16:45:28 +0100 |
| commit | b9f57807e62daa51eb8bbc94eebdd0fc6346a1f3 (patch) | |
| tree | f55f5e7bd7c7bb151667de5c07be43435f45069b /build/debian | |
| parent | bd3e580fac91f8852643ccd12d4cb81b2dcd35de (diff) | |
| parent | 4fd84daa1891a6038ee8077a63cf24b695ecea5e (diff) | |
Merge branch '2.1' of git@github.com:mixxxdj/mixxx.git into merge_2.1
# Conflicts:
# CHANGELOG
# src/defs_version.h
# src/engine/ratecontrol.h
Diffstat (limited to 'build/debian')
| -rw-r--r-- | build/debian/changelog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/debian/changelog b/build/debian/changelog index 19145cc9d4..f0c815ebb5 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. |