diff options
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 2cb6795fa..b69567a2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.71.0-1) UNRELEASED; urgency=low +dcpomatic (1.71.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -164,11 +164,9 @@ dcpomatic (1.71.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. -<<<<<<< HEAD - -- Carl Hetherington <carl@d1stkfactory> Thu, 26 Jun 2014 19:30:39 +0100 -======= - -- Carl Hetherington <carl@d1stkfactory> Fri, 27 Jun 2014 13:25:44 +0100 ->>>>>>> 1.70.0-hotfix +<<<<<<< HEAD * New upstream release. + + -- Carl Hetherington <carl@d1stkfactory> Sat, 28 Jun 2014 00:53:18 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low |