Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 1 Oct 2014 21:52:08 +0000 (22:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 1 Oct 2014 21:52:08 +0000 (22:52 +0100)
commit49da659616cc755dac337f297b3212ecf4564c2e
tree9412cfd0d669600cf321e07a9172815ee38db451
parente0654738924173412ee4a5b703c66b05a2f7e964
parent5c8fe10cb3dbf799ffba926796d86b7b32b00d31
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
wscript