summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-16 16:47:05 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-16 16:47:05 +0100
commita65d08d8a4e84b1f2321154fc4b16384dcd6b10f (patch)
tree7a2eabc2a2b32fca7aa9b8a0f2470d039637294b
parent784440c45ee7469890a15ed612018eb66c2152dc (diff)
parent61ba36e642cca1efe5e1e5352d995df351e97e91 (diff)
Merge branch 'master' of git.carlh.net: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 82ee2675e..99192f4cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-16 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.75.0 released.
+
2014-10-14 Carl Hetherington <cth@carlh.net>
* Version 1.74.3 released.
diff --git a/debian/changelog b/debian/changelog
index efd8fd73d..57f506c3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.74.3-1) UNRELEASED; urgency=low
+dcpomatic (1.75.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -189,8 +189,9 @@ dcpomatic (1.74.3-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Tue, 14 Oct 2014 18:38:17 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Thu, 16 Oct 2014 16:40:17 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 2849d5759..80c385c75 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.74.3devel'
+VERSION = '1.75.0devel'
def options(opt):
opt.load('compiler_cxx')