summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-02-17 01:02:13 +0000
committerCarl Hetherington <cth@carlh.net>2013-02-17 01:02:13 +0000
commitcd35f8e7e6832581f64f5d364d61dc42839eb687 (patch)
treec89cedb8d0edd1344cafd64b30218641b4e4b0d0
parentb8cb646c2fc0dda578aecc212db3dfb141ab9e55 (diff)
parente120fc193547df8e0888534e87361294440dd5b7 (diff)
Merge branch 'direct-mxf' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into direct-mxf
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog12
-rw-r--r--src/tools/dvdomatic.cc2
-rw-r--r--wscript2
4 files changed, 22 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bec619ded..90062e2e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-16 Carl Hetherington <cth@carlh.net>
+
+ * Version 0.73beta2 released.
+
+2013-02-16 Carl Hetherington <cth@carlh.net>
+
+ * Version 0.73beta1 released.
+
2013-02-15 Carl Hetherington <cth@carlh.net>
* Fix non-recognition of BMP for still images (#55),
diff --git a/debian/changelog b/debian/changelog
index 9ee5288ba..318575c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dvdomatic (0.73beta2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Sat, 16 Feb 2013 22:42:32 +0000
+
+dvdomatic (0.73beta1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Sat, 16 Feb 2013 21:19:24 +0000
+
dvdomatic (0.72-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 21c2ce760..e4f582472 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -284,7 +284,7 @@ private:
if (r == wxID_OK) {
if (boost::filesystem::exists (d->get_path())) {
- error_dialog (this, wxString::Format (_("The directory %s already exists"), d->get_path().c_str()));
+ error_dialog (this, wxString::Format (_("The directory %s already exists."), d->get_path().c_str()));
return;
}
diff --git a/wscript b/wscript
index 06c193c4f..a029d41a6 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.73pre'
+VERSION = '0.73beta2'
def options(opt):
opt.load('compiler_cxx')