Merge.

3 files changed, 19 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e9b9fe58..f1fbcfd23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
 2014-01-12  Carl Hetherington  <cth@carlh.net>
 
 	* Fix crashes when using -3dB options in locales with a , decimal separator.
+	
+	* Version 1.62.3 released.
+
+2014-01-11  Carl Hetherington  <cth@carlh.net>
+
+	* Hopefully fix error on restarting a cancelled transcode job
+	on Windows.
+
+2014-01-10  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.62.2 released.
+
+2014-01-10  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.62.1 released.
 
 2014-01-10  Carl Hetherington  <cth@carlh.net>
 
diff --git a/debian/changelog b/debian/changelog
index 5181ae932..96cbe3938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.62.2-1) UNRELEASED; urgency=low
+dcpomatic (1.62.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -70,8 +70,9 @@ dcpomatic (1.62.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 10 Jan 2014 14:14:09 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 11 Jan 2014 18:38:13 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 7baba5468..babf5a00d 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.62.2devel'
+VERSION = '1.62.3devel'
 
 def options(opt):
     opt.load('compiler_cxx')