From: Carl Hetherington <cth@carlh.net>
Date: Fri, 23 Jan 2015 22:29:16 +0000 (+0000)
Subject: Fix merge.
X-Git-Tag: v2.0.48~281
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a65de358d225fdfcbdabc3473cffd4f62a4b0785

Fix merge.
---

a65de358d225fdfcbdabc3473cffd4f62a4b0785
diff --cc ChangeLog
index 31134acf9,1621d623c..1a86e5b00
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
  2015-01-23  Carl Hetherington  <cth@carlh.net>
  
 +	* 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.