Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x
authorCarl Hetherington <cth@carlh.net>
Mon, 21 Jan 2019 17:06:06 +0000 (17:06 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 21 Jan 2019 17:06:06 +0000 (17:06 +0000)
commit7146c3448622f7bff205af6bf484338cb231474f
treec5e2801e0c83b0e0a6f5b4f36c5f4f1e4f94d501
parentac3fecc5bd3eaf279c668e331f6f92a02a2d41d3
parent168809616cabf35cbfdd10fdab3666120c6d8fe7
Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x