Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic

diff --git a/ChangeLog b/ChangeLog
index 7f4045c4f97812326de6d75fc75a3aad27651f19..d35f0054323cc660d03cba6b4a6ff4fbbd324743 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-08  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.64.4 released.
+
 2014-02-08  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.64.3 released.

diff --git a/debian/changelog b/debian/changelog
index a9bf676ad904c8c39550656ab7967e200dd92992..aa29a25dbd8dadfe51c9809bc59994ca648c7e27 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.3-1) UNRELEASED; urgency=low
+dcpomatic (1.64.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -84,8 +84,9 @@ dcpomatic (1.64.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 08 Feb 2014 13:33:08 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 08 Feb 2014 16:38:06 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 8663f2caa1de0cbc5ce17a7b98c01c04157cd5fe..0f94b58d86f3964be6f9741c89d7bd362cc41ad9 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.64.3devel'
+VERSION = '1.64.4devel'
 
 def options(opt):
     opt.load('compiler_cxx')