Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index a671a9e8dd38df8a602e17b626ab8b705cbb2b66..aca6809c47de70a020be6cdd53d02fc823b04dfc 100644 (file)
--- 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
+dcpomatic (2.0.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -178,8 +174,10 @@ dcpomatic (1.73.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 29 Aug 2014 19:04:40 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 09 Sep 2014 21:05:24 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low