diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-04 00:05:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-04 00:05:04 +0100 |
| commit | cb1dfa9ec09af2abf6d10e4bf2764476db83841b (patch) | |
| tree | 5ccd5fd123fa07702b6cf647cedb7df8e8917fa0 /debian | |
| parent | dc120d521c740b7f1ec356538139c5769a5f54be (diff) | |
| parent | 4092121ad052f406e8b5c5a2debbd8256321f182 (diff) | |
Merge master.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index a671a9e8d..99cdc4f58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,4 @@ -<<<<<<< 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. |