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

diff --git a/debian/changelog b/debian/changelog
index 05d8e42bf..9087bd105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.76.2-1) UNRELEASED; urgency=low
+dcpomatic (2.0.15-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -193,8 +193,17 @@ dcpomatic (1.76.2-1) UNRELEASED; urgency=low
   * 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, 20 Oct 2014 22:50:32 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 24 Oct 2014 01:19:26 +0100
+>>>>>>> origin/master
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low