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)
commit5e4f001bf32e3cdf65efa34803d70e6c1c00c66b
tree42c80060fbd6498673b65bf55422842d4ed7ba7a
parentcf8bbea2de38c4e9ac140f55b27311b7b6dcd814
parent99bb224f2362126f5a5011860b8aafc3ea1cca5f
Merge remote-tracking branch 'origin/master' into 2.0
platform/osx/make_dmg.sh
run/dcpomatic