Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 31 Aug 2014 23:10:53 +0000 (00:10 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 31 Aug 2014 23:10:53 +0000 (00:10 +0100)
1  2 
platform/osx/make_dmg.sh
run/dcpomatic

Simple merge
diff --cc run/dcpomatic
Simple merge