From: Carl Hetherington <cth@carlh.net>
Date: Sun, 7 Apr 2013 12:53:52 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~1337^2~463
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5859b758e3a6e0191ce12e77b636c7def58bbc3b

Merge master.
---

5859b758e3a6e0191ce12e77b636c7def58bbc3b
diff --cc src/lib/wscript
index 896598a0e,8e9d34706..8f0e851e3
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@@ -51,11 -45,8 +51,10 @@@ sources = ""
            timer.cc
            transcode_job.cc
            transcoder.cc
 +          types.cc
            ui_signaller.cc
            util.cc
-           version.cc
 +          video_content.cc
            video_decoder.cc
            video_source.cc
            writer.cc