Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Aug 2016 13:10:54 +0000 (14:10 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Aug 2016 13:10:54 +0000 (14:10 +0100)
commit4aa2c70aa6b240d426f782b215749bee7399d6c4
tree27e8c7759a0dff7f0370cead7b7b23265f3a2946
parentf8a0bc6135a933dcf660bbc46b4b3d29d503690e
parent1735af36a8fe197b1cc77b569b3933c74457d995
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
ChangeLog