Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 2 Jul 2015 08:20:00 +0000 (09:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 2 Jul 2015 08:20:00 +0000 (09:20 +0100)
commit757b0ddcb376b3ed8265b3457a8b1adefa7b649e
treee059da11805a5dea57b743a6e66ddc9065bbaedd
parent95d0593f9e6a0e0e8baa516326aee60f065031a7
parent676cd81d3076e15d0b8b09765b7a66c0beaea614
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0