Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)
commitdfd42d2a546d14c32057a34002543877ea2f99cb
treeccaf3c3edd37c9022bd39f8e263b7f025d550011
parent48b82de5b6e8e07330a2f72dbddd8d9830fe047e
parent74d4cd23df7460cf1d0e91fd7a37fa3333741887
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
src/lib/util.cc
test/test.cc