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)
1  2 
src/lib/player.cc

Simple merge