summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-10-13 13:12:19 +0100
committerCarl Hetherington <cth@carlh.net>2013-10-13 13:12:19 +0100
commit601001cc7abb3e69ae363dfde7c98c8ff4848b95 (patch)
tree741aaa643a3a5be98485f6657366998d0dba1a0f
parentec9fef77094f5969d6c7452f1d03bcae745b30d1 (diff)
parent6028b10bcb0579ca702c5e7a1140ba3e58681d01 (diff)
Merge branch '1.0' of /Users/carl/git/dvdomatic into 1.0
-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 1201e36ca..7cd3c67e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-13 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.14 released.
+
2013-10-12 Carl Hetherington <cth@carlh.net>
* Add some missing libraries to the OS X build.
diff --git a/debian/changelog b/debian/changelog
index 5e5fdb468..18ce8f216 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.13-1) UNRELEASED; urgency=low
+dcpomatic (1.14-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -17,8 +17,9 @@ dcpomatic (1.13-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sat, 12 Oct 2013 13:36:59 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Sun, 13 Oct 2013 12:55:47 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 2386823f2..bcda8d74d 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.14pre'
+VERSION = '1.15pre'
def options(opt):
opt.load('compiler_cxx')