diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-05 23:54:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-05 23:54:26 +0100 |
| commit | 152b14ab5509678f3d68b52a1ed275cfdc38191b (patch) | |
| tree | dfb891a635e3e1062590308b41ae8263d993cd41 | |
| parent | ebcdc90fa32c22895b958126ba5a6a4d562616ad (diff) | |
| parent | 3fe5cabf752fc6c87f6fbc453dfcd642655faed0 (diff) | |
Merge 2.0.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | run/dcpomatic_cli | 8 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 12 insertions, 7 deletions
@@ -3,6 +3,10 @@ * Use a more sensible default position and size for .srt subs. +2014-10-03 Carl Hetherington <cth@carlh.net> + + * Version 2.0.14 released. + 2014-10-01 Carl Hetherington <cth@carlh.net> * Version 2.0.13 released. diff --git a/debian/changelog b/debian/changelog index 17cbec9fc..1a0185aca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ -dcpomatic (2.0.13-1) UNRELEASED; urgency=low +dcpomatic (2.0.14-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Wed, 01 Oct 2014 09:54:33 +0100 + -- Carl Hetherington <carl@d1stkfactory> Fri, 03 Oct 2014 19:41:52 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/run/dcpomatic_cli b/run/dcpomatic_cli index ea2a98763..e1c0ebd14 100755 --- a/run/dcpomatic_cli +++ b/run/dcpomatic_cli @@ -3,11 +3,11 @@ export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH:build/src if [ "$1" == "--debug" ]; then shift - gdb --args build/src/tools/dcpomatic_cli "$@" + gdb --args build/src/tools/dcpomatic2_cli "$@" elif [ "$1" == "--valgrind" ]; then shift - valgrind --tool="memcheck" --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic_cli "$@" -# valgrind --tool="memcheck" --leak-check=full --show-reachable=yes --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic_cli "$@" + valgrind --tool="memcheck" --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic2_cli "$@" +# valgrind --tool="memcheck" --leak-check=full --show-reachable=yes --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic2_cli "$@" else - build/src/tools/dcpomatic_cli "$@" + build/src/tools/dcpomatic2_cli "$@" fi @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '2.0.13devel' +VERSION = '2.0.14devel' def options(opt): opt.load('compiler_cxx') |