projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge master.
[dcpomatic.git] / debian / changelog
diff --git a/debian/changelog b/debian/changelog
index 2cb6795fa2c6ed5bdb2776850297696b9be41599..3829ca4ba37e5f2a7ddfaa43aebc39fea56dd4af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,174 +1,10 @@
-dcpomatic (1.71.0-1) UNRELEASED; urgency=low
+dcpomatic (2.0.11-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>  Mon, 22 Sep 2014 23:05:40 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
2.0 development branch of dcpomatic