From: Carl Hetherington <cth@carlh.net>
Date: Sat, 18 Oct 2014 21:18:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.0.48~551^2~9
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=402eeecead89fe0703b641cdc4cecc29db18311e

Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
---

402eeecead89fe0703b641cdc4cecc29db18311e
diff --cc wscript
index f5d1a1c34,786ff4287..efbf69eaa
--- a/wscript
+++ b/wscript
@@@ -1,11 -1,9 +1,11 @@@
  import subprocess
  import os
  import sys
 +import distutils
 +import distutils.spawn
  
  APPNAME = 'dcpomatic'
- VERSION = '1.75.1devel'
+ VERSION = '1.75.2devel'
  
  def options(opt):
      opt.load('compiler_cxx')