Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 14 Jun 2016 08:34:09 +0000 (09:34 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 14 Jun 2016 08:34:09 +0000 (09:34 +0100)
commit3d6501346b187f35d0f55d16e13f8817f505a82f
treef57c153b99a5301de3e7024bc414706749974d0a
parentcd29c4ed26fde9b9c07190f92205705b13c6bd73
parent6b9c1b3bdec2b4396314ccf6bf2d5aeaa5402ae6
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
ChangeLog