diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-27 13:28:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-27 13:28:08 +0100 |
| commit | af2dfe1cbabaa3c1fb663063a1f9778858255818 (patch) | |
| tree | c9a4aa0f0db38bdbf8b0c44447ded3a9723b98c0 /debian | |
| parent | 20fa26ea6ecfdbecea8bb1230c8388cce3fd521f (diff) | |
| parent | f357af9220d2b890a64ccd8b81bfe02b69a0450d (diff) | |
Merge 1.70.0-hotfix branch into master.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7a38ec535..2cb6795fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.70.1-1) UNRELEASED; urgency=low +dcpomatic (1.71.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -164,7 +164,11 @@ dcpomatic (1.70.1-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 dcpomatic (0.87-1) UNRELEASED; urgency=low |