diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-30 13:22:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-30 13:22:41 +0100 |
| commit | 2d24bc7aaed800415bce4fffe06f261d5e9e464a (patch) | |
| tree | 8b8db697823e676e95a0d36466f559985f9bd6f7 /debian | |
| parent | fdc07bf53d35196bfe6514f34fa885dcfe9bc4b8 (diff) | |
| parent | 8db9e4f88fd3710dd972f0233e6f1b60b691a569 (diff) | |
Merge master.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 99cdc4f58..a671a9e8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,8 @@ +<<<<<<< HEAD dcpomatic (2.0.4-1) UNRELEASED; urgency=low +======= +dcpomatic (1.73.0-1) UNRELEASED; urgency=low +>>>>>>> origin/master * New upstream release. * New upstream release. |