X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=1da8a1f91707c709a48beaa08630d3c38924a409;hb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;hp=5bdbcbb0047fab494570d420bdd36b2be56704d5;hpb=0d412e1897aa1d379aabaf4f14f997c0b80db653;p=dcpomatic.git

diff --git a/debian/changelog b/debian/changelog
index 5bdbcbb00..1da8a1f91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.30-1) UNRELEASED; urgency=low
+dcpomatic (2.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -154,8 +154,32 @@ dcpomatic (1.69.30-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.
+<<<<<<< HEAD
+
+ -- Carl Hetherington <carl@dalglish>  Wed, 06 Aug 2014 18:59:35 +0100
+=======
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 20 Jun 2014 11:12:54 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 09 Aug 2014 12:38:18 +0100
+>>>>>>> origin/master
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low