Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 27 Jul 2018 15:14:41 +0000 (16:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 27 Jul 2018 15:14:41 +0000 (16:14 +0100)
commitae4f0d9f55489ddc50b3e5f0d713621ee8f50645
tree05adaa258ecce8029f754a58c847ac3904239400
parent3009a585f5222a83213c786e3c564c740f450d18
parent3006dde72c92356165ef841910368d0dae27ddbe
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
src/lib/player.cc
src/lib/player.h