Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 13 May 2015 22:44:54 +0000 (23:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 13 May 2015 22:44:54 +0000 (23:44 +0100)
commit65274489101d5b5c503ea94d61d7ac5eb1372636
tree2d11e71e33f78ef3224af436c8c93525b4135cfc
parentedecc975384bfef50418e3fb77e5c4629207ec08
parent419c025709132e21ce948c4a6051a323f06ee61d
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0