Fix merge.

3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 31134acf9..1a86e5b00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Fix flicker of SubRip subtitles in some cases.
 
+	* Version 2.0.37 released.
+
 2015-01-21  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.36 released.
diff --git a/debian/changelog b/debian/changelog
index f9dad6546..0ce6a2ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.36-1) UNRELEASED; urgency=low
+dcpomatic (2.0.37-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -215,8 +215,9 @@ dcpomatic (2.0.36-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 21 Jan 2015 19:37:44 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 23 Jan 2015 21:23:06 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index d24353370..d0745c22f 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.36devel'
+VERSION = '2.0.37devel'
 
 def options(opt):
     opt.load('compiler_cxx')