X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=790e5e7f74007ca542f62f3b50b04d7135c7aa56;hb=23e8fcf09d1590d6f1f861b2776a6171c578ef98;hp=5dedc91f00ce991f4799fc5bd4d340349898bd65;hpb=d5ce89148b63d36696dee783a1b7e075489aa21a;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index 5dedc91f0..790e5e7f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.16-1) UNRELEASED; urgency=low
+dcpomatic (2.0.39-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -195,10 +195,31 @@ dcpomatic (2.0.16-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
-<<<<<<< HEAD
+  * 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>  Sun, 26 Oct 2014 22:43:43 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 06 Feb 2015 21:43:15 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low