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

diff --git a/debian/changelog b/debian/changelog
index 41c9652c5..a671a9e8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
-dcpomatic (1.69.27-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.
@@ -151,8 +155,31 @@ dcpomatic (1.69.27-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.
+  * 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>  Thu, 12 Jun 2014 16:51:24 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 29 Aug 2014 19:04:40 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low