summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-12-02 20:55:33 +0000
committerCarl Hetherington <cth@carlh.net>2012-12-02 20:55:33 +0000
commitd968824110c032494b31f04cdb2551324e737bde (patch)
tree871bde7f374d570def4e16f3ae534defad20c044
parentcf2a7295b626de37dfb4c7f1f34c6d3ab244a474 (diff)
parentbfa0eb6afdd82934a19b1d31407d2956235292c3 (diff)
Merge branch 'master' of /home/carl/git/dvdomatic
-rwxr-xr-xrelease1
-rw-r--r--src/lib/log.h1
-rw-r--r--src/wx/film_viewer.cc1
3 files changed, 3 insertions, 0 deletions
diff --git a/release b/release
index 29da203c1..807bd264c 100755
--- a/release
+++ b/release
@@ -81,3 +81,4 @@ if (raw_input() != "y"):
sys.exit(1)
command("git commit -a -m \"Bump version\"")
+command("cp DVD-o-matic*.exe dvdomatic-*.tar.bz2 /home/carl/public_html/carlh.net/software/dvdomatic")
diff --git a/src/lib/log.h b/src/lib/log.h
index 2e5d69a08..298b425cd 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -34,6 +34,7 @@ class Log
{
public:
Log ();
+ virtual ~Log () {}
enum Level {
STANDARD = 0,
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 79de49406..a82132358 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -43,6 +43,7 @@ public:
ThumbPanel (wxPanel* parent, shared_ptr<Film> film)
: wxPanel (parent)
, _film (film)
+ , _index (0)
, _frame_rebuild_needed (false)
, _composition_needed (false)
{}