Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 7 Jan 2016 15:17:31 +0000 (15:17 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 7 Jan 2016 15:17:31 +0000 (15:17 +0000)
commit52b9a5f3edb119c19ce49c6885a7f3733d11f2e8
tree02be420e7d4691c3b401b58037ab67e3f3be36d1
parentf9482e2896031942784f870306e705d070ceac9d
parent89384629fa7020b11f0bf68cbf19f69de244a040
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
ChangeLog