Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Sep 2014 20:16:33 +0000 (21:16 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Sep 2014 20:16:33 +0000 (21:16 +0100)
commit99178eea5f3d326ece871ec82da1d7ca9e2dbcaf
treefb061859d069605944bc62c5b27543265d4e60ab
parent138dbf31b4f4d711113f91d597c4f312b756d59b
parentc177bbcd0f77aab611064fd8bd706b0df337d881
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
ChangeLog