Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 23 Jan 2015 17:15:18 +0000 (17:15 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 23 Jan 2015 17:15:18 +0000 (17:15 +0000)
commitf455579f4c2fd2321b2891a03cd9e466b2299148
tree6ddf977d2cc656949c7393cd9899724cfaacfc3e
parent2c7554d01512585cc4052845799588806c994d69
parente8fcbfaa9b5844400a2c64b5cdaa07442cca968d
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0