diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /debian | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 1da8a1f91..09d401782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -171,15 +171,8 @@ 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 |