Bump version

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5bdbcbb0047fab494570d420bdd36b2be56704d5..b69567a2d853623a235a0397c343012eb8f38bc2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.30-1) UNRELEASED; urgency=low
+dcpomatic (1.71.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -154,8 +154,19 @@ 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.
+
+<<<<<<< HEAD  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 20 Jun 2014 11:12:54 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 28 Jun 2014 00:53:18 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low