Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 16 May 2014 10:42:24 +0000 (11:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 May 2014 10:42:24 +0000 (11:42 +0100)
commit47f064f6a204ba6c34d8615f260b0cf3ba8850b1
tree82b9402e448dec6790b83d7f13898f87be81075e
parentae1c1a7d71e9ff514865fcd51e97e2bad8828c5d
parent97d7d9cc9f61dcf01f45ed0d387a4441748d6dfa
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
ChangeLog