summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-08 23:28:09 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-08 23:28:09 +0000
commitc2e2b2bace98d1ad297c7351a907ed7713fa1850 (patch)
tree54f5b9212b086c381aa571b388b75c6ec09b742c
parentc6a57fe6abccac8dde49a77d5bfe6943f70e080c (diff)
parent5b8fafecf252edfb1ef7bc9fe26c5e74c34d852d (diff)
Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog5
-rw-r--r--wscript2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a7127c7c2..1ec58c989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-08 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.59 released.
+
2014-01-07 Carl Hetherington <cth@carlh.net>
* Version 1.58 released.
diff --git a/debian/changelog b/debian/changelog
index 6632cd446..3993de498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.58-1) UNRELEASED; urgency=low
+dcpomatic (1.59-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -62,8 +62,9 @@ dcpomatic (1.58-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Tue, 07 Jan 2014 22:59:52 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Wed, 08 Jan 2014 12:39:03 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 114e3cbad..a82d9d8fd 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.59pre'
+VERSION = '1.60pre'
def options(opt):
opt.load('compiler_cxx')