Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Apr 2015 08:20:56 +0000 (09:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Apr 2015 08:20:56 +0000 (09:20 +0100)
commitcf0c9b44c5ec1884176a07f8f2c383ac505569a4
tree13aebd930e0344a052096ed642beda061ea01064
parent68a5daa79ed34bae144de1dc252a4c6539e08fa1
parent1a62bdec95ce3b454bc92f2ebd06782a3d815f4d
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0