X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=3829ca4ba37e5f2a7ddfaa43aebc39fea56dd4af;hb=31e99800b3d954cd3bec5974dbba4b937d9b011d;hp=a671a9e8dd38df8a602e17b626ab8b705cbb2b66;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;p=dcpomatic.git diff --git a/debian/changelog b/debian/changelog index a671a9e8d..3829ca4ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,185 +1,10 @@ -<<<<<<< HEAD -dcpomatic (2.0.4-1) UNRELEASED; urgency=low -======= -dcpomatic (1.73.0-1) UNRELEASED; urgency=low ->>>>>>> origin/master +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. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - -- Carl Hetherington Fri, 29 Aug 2014 19:04:40 +0100 + -- Carl Hetherington Mon, 22 Sep 2014 23:05:40 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low