Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Thu, 30 May 2019 21:33:35 +0000 (22:33 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 30 May 2019 21:33:35 +0000 (22:33 +0100)
1  2 
test/recover_test.cc

Simple merge