diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 9087bd105..5dedc91f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.0.15-1) UNRELEASED; urgency=low +dcpomatic (2.0.16-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -196,14 +196,9 @@ dcpomatic (2.0.15-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. <<<<<<< HEAD - - -- Carl Hetherington <carl@d1stkfactory> Wed, 22 Oct 2014 14:24:53 +0100 -======= - * New upstream release. * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Fri, 24 Oct 2014 01:19:26 +0100 ->>>>>>> origin/master + -- Carl Hetherington <carl@d1stkfactory> Sun, 26 Oct 2014 22:43:43 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low |