diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-25 14:47:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-25 14:47:43 +0100 |
| commit | b6c780d3107557d452c6612d715d01e2be52dbda (patch) | |
| tree | 3548fe3eef61f3b0145bb33a57a89f97bfa75f50 /debian | |
| parent | e725a6b4bce2a05275ee611965c62d6803f3bf7c (diff) | |
| parent | 0dcbc398124f740e4fd7b552926f601a3e5c755e (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 5702a6dfd..9087bd105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -195,8 +195,15 @@ dcpomatic (2.0.15-1) UNRELEASED; urgency=low * New upstream release. * 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 dcpomatic (0.87-1) UNRELEASED; urgency=low |