Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 31 Aug 2015 17:56:25 +0000 (18:56 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 31 Aug 2015 17:56:25 +0000 (18:56 +0100)
commitdc9dc1a61c2670c6017948e84a092c8416973cd1
tree140cdbe1bbae160eda6ae55b200f12d1a533ca01
parentada1c702da6a1d892286a8665d9e0e93dac4c166
parent760cc7d05f8b2a5c85f2535caa97ea8c95db357a
Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0