X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=c71a60422ab52f203e25232b7be235be1446fc67;hb=1c13441a19aa387ddd8ac0c972207ccbbe3114d8;hp=2cb6795fa2c6ed5bdb2776850297696b9be41599;hpb=af2dfe1cbabaa3c1fb663063a1f9778858255818;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index 2cb6795fa..c71a60422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,174 +1,8 @@
-dcpomatic (1.71.0-1) UNRELEASED; urgency=low
+dcpomatic (2.0.9-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.
-  * 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.
-  * 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.
-  * 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.
-  * 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.
-  * 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
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 26 Jun 2014 19:30:39 +0100
-=======
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 27 Jun 2014 13:25:44 +0100
->>>>>>> 1.70.0-hotfix
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 12 Sep 2014 00:17:46 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low