Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x
authorCarl Hetherington <cth@carlh.net>
Sun, 18 Feb 2018 00:37:45 +0000 (00:37 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 18 Feb 2018 00:37:45 +0000 (00:37 +0000)
commit59500421bda6e44bc6e92e27c6c21ea071eb81c1
tree88883f1a6e2e173a33455d9401030b94defbc2c8
parent3b83d4be7b9eadb6631cb98e289635154f84ad25
parent01238dc192e4864b1665a03661e684240ac7f884
Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x