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)
commit4e0e525106669ef350e86721f77a508d178524c8
tree423ce07ca6316127fd8df2a1309b94c60d0258cb
parentbf4273cb88539fbacd0c13f7ca30bbe48e6ad346
parent9b98a07cb61fd66fd73f9f58468100ec9b7eddd3
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
test/recover_test.cc