Speculative v2 update.

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7a82f85e9cfce5484c199ed1df4d9bc3552b085e..a671a9e8dd38df8a602e17b626ab8b705cbb2b66 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
-dcpomatic (1.72.2-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.
@@ -167,8 +171,15 @@ dcpomatic (1.72.2-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.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 10 Jul 2014 21:27:55 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 29 Aug 2014 19:04:40 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low