diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 7002c19cf..a671a9e8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,8 @@ +<<<<<<< HEAD +dcpomatic (2.0.4-1) UNRELEASED; urgency=low +======= dcpomatic (1.73.0-1) UNRELEASED; urgency=low +>>>>>>> origin/master * New upstream release. * New upstream release. @@ -174,10 +178,8 @@ dcpomatic (1.73.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. - * New upstream release. - * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Tue, 26 Aug 2014 21:47:56 +0100 + -- Carl Hetherington <carl@d1stkfactory> Fri, 29 Aug 2014 19:04:40 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low |