diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-11 22:39:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-11 22:39:20 +0100 |
| commit | cc27c2716f755305d67f1e1ba828ecf37f8405dd (patch) | |
| tree | 224d2b1c469bc671e6b826e8a535f61f6459bc81 /debian | |
| parent | 4ddf91dda7d84f169e4b905fd41cf747f4a0102c (diff) | |
| parent | 491daf8790f35611052d8954d5d74df275dcda18 (diff) | |
Merge master.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 09d401782..1da8a1f91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -171,8 +171,15 @@ dcpomatic (2.0.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. +<<<<<<< HEAD -- Carl Hetherington <carl@dalglish> Wed, 06 Aug 2014 18:59:35 +0100 +======= + * New upstream release. + * New upstream release. + + -- Carl Hetherington <carl@d1stkfactory> Sat, 09 Aug 2014 12:38:18 +0100 +>>>>>>> origin/master dcpomatic (0.87-1) UNRELEASED; urgency=low |