Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 4 Sep 2015 10:42:01 +0000 (11:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 4 Sep 2015 10:42:01 +0000 (11:42 +0100)
commitb8611be3c3c393b6f012ee65eb8a4e12958415a0
tree0f77eede544f2136a62f3d501837e554c7c90f03
parent9090e85f2a64c7d84d030a6763b8dcc4fd4138fc
parent71da9ed06cef6dccd79f31b6f706cc34a9d15b27
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0