Bump version

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5dedc91f00ce991f4799fc5bd4d340349898bd65..6614078188d0275bc1a5baf8eea0cb2f9d0aa209 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.16-1) UNRELEASED; urgency=low
+dcpomatic (2.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -195,10 +195,44 @@ dcpomatic (2.0.16-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
-<<<<<<< HEAD
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * 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 <carl@d1stkfactory>  Sun, 26 Oct 2014 22:43:43 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 13 Jun 2015 15:50:39 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low