diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2019-02-03 09:44:49 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-02-03 09:44:49 +0100 |
| commit | 5cb57dfd487b8ac39e5b69740961aa07881bd59f (patch) | |
| tree | bd03b95c558268be722cfeb218603d31d258a43b /build/debian | |
| parent | 1e193407fda806d9cc44116ff439de47bf2cbf70 (diff) | |
| parent | 6defdf3160e95fb4408928d045c2e2abac95051c (diff) | |
Merge remote-tracking branch 'upstream/2.1' into 2.2
Conflicts:
CHANGELOG
src/defs_version.h
Diffstat (limited to 'build/debian')
| -rw-r--r-- | build/debian/changelog | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/debian/changelog b/build/debian/changelog index f0c815ebb5..e054636581 100644 --- 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 |