Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 17 May 2017 22:34:04 +0000 (23:34 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 17 May 2017 22:34:04 +0000 (23:34 +0100)
commit4f806ddec2b60c2d2e7a7d756e8aa299305b1e9f
tree92f851443420ef8d97f08990ae2f852f5cff0057
parentf33ce8ef9af44e6fbef9cb89f11970d5ec2a1ff5
parentd892e433ac6c14890b7f87052eda38556abb6b62
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
src/lib/player.cc