Merge master.

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b69567a2d853623a235a0397c343012eb8f38bc2..67dbff2a4d0eeb010a69deb5c741570f948e1762 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.71.1-1) UNRELEASED; urgency=low
+dcpomatic (2.0.14-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -163,10 +163,33 @@ dcpomatic (1.71.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.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
-<<<<<<< HEAD  * New upstream release.
-
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 28 Jun 2014 00:53:18 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 08 Oct 2014 10:37:21 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low