Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 5 Jan 2017 09:37:57 +0000 (09:37 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 5 Jan 2017 09:37:57 +0000 (09:37 +0000)
commitc8be0644833dce6ff39202430bba0ab358f3e096
tree1007061e5aac388825260ad1c016e8efd6f43919
parent23690fa77d69f841569b7b7e03feb55db34622bb
parent736f9d8154080ea5837b31af623ef863eea1a7c5
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
ChangeLog