Bump version

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5dedc91f00ce991f4799fc5bd4d340349898bd65..ddf86e8b3a3fa5bb5f6b8023eb89b9ee43b22a93 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.16-1) UNRELEASED; urgency=low
+dcpomatic (2.0.48-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -195,10 +195,40 @@ 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.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 26 Oct 2014 22:43:43 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 04 Jun 2015 00:56:57 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low