X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=9087bd1051a832f11a1182d21c1fc22c8ea2229b;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=fe8a3c7750b77924fc4dad2e0469b2bc64e1ca22;hpb=e50e596448d17f32652a8215a01ae62a32c9afea;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index fe8a3c775..9087bd105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.73.1-1) UNRELEASED; urgency=low
+dcpomatic (2.0.15-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -177,8 +177,33 @@ dcpomatic (1.73.1-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.
+<<<<<<< HEAD
+
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 22 Oct 2014 14:24:53 +0100
+=======
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 01 Sep 2014 00:35:03 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 24 Oct 2014 01:19:26 +0100
+>>>>>>> origin/master
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low