X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=a671a9e8dd38df8a602e17b626ab8b705cbb2b66;hb=2d24bc7aaed800415bce4fffe06f261d5e9e464a;hp=34067724ab8c08ef438635e66053b3af9f071d55;hpb=f0edd6ab35c3c2b7800a26ec8206adab75e5f633;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index 34067724a..a671a9e8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
-dcpomatic (1.69.34-1) UNRELEASED; urgency=low
+<<<<<<< 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.
@@ -158,8 +162,24 @@ dcpomatic (1.69.34-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 21 Jun 2014 22:26:15 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 29 Aug 2014 19:04:40 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low