summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-18 22:18:26 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-18 22:18:26 +0100
commit402eeecead89fe0703b641cdc4cecc29db18311e (patch)
tree5ff6c6a97d831ef3d93f110b5ce811519eeb209f
parent734340b52d30cb2dde9aa9e81c77277b261b128e (diff)
parentd11fa8639d52d2fd673724d21882268116da3458 (diff)
Merge branch 'master' of ssh://main.carlh.net/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 dc6f7cafb..e8972aa2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-10-16 Carl Hetherington <cth@carlh.net>
+ * Version 1.75.2 released.
+
+2014-10-16 Carl Hetherington <cth@carlh.net>
+
* Version 1.75.1 released.
2014-10-16 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 43e14527d..6a86870a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.75.1-1) UNRELEASED; urgency=low
+dcpomatic (1.75.2-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -191,8 +191,9 @@ dcpomatic (1.75.1-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Thu, 16 Oct 2014 16:48:12 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Thu, 16 Oct 2014 18:57:29 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index f5d1a1c34..efbf69eaa 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
import distutils.spawn
APPNAME = 'dcpomatic'
-VERSION = '1.75.1devel'
+VERSION = '1.75.2devel'
def options(opt):
opt.load('compiler_cxx')