Speculative v2 update.

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 32ab78e759c029da22d8c200b9d3a08bd93886fb..a671a9e8dd38df8a602e17b626ab8b705cbb2b66 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
-dcpomatic (1.72.3-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.
@@ -168,8 +172,14 @@ dcpomatic (1.72.3-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.
 
- -- Carl Hetherington <carl@107.191.37.242.vultr.com>  Wed, 16 Jul 2014 14:26:32 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 29 Aug 2014 19:04:40 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low