Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 5 Dec 2014 15:10:49 +0000 (15:10 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 5 Dec 2014 15:10:49 +0000 (15:10 +0000)
commitcf8e0e9e26dbaefab768000ebc1655b34ad11105
tree0569645fc756947706aba78a41c7633743d395b6
parente894cfe3d891135d1b92b62603a464e42bd6ed5c
parentf73d7b437661f08870021e3dafc936daf17f94e8
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0