Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 22 Jan 2015 10:39:06 +0000 (10:39 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 22 Jan 2015 10:39:06 +0000 (10:39 +0000)
commite8fcbfaa9b5844400a2c64b5cdaa07442cca968d
tree8ea982f308393e1711dc93ffa1f8efc22d8aace4
parent7df7b2c7868f67abccb170738e1ae1025cbc0244
parentc1f235f5aeb65cb42c5346419807ac5bb7d6406a
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0