Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 14 Jun 2015 21:07:24 +0000 (22:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 14 Jun 2015 21:07:24 +0000 (22:07 +0100)
commitb19fed96652628c7d5c397bdc797b8717afeb44b
tree6aeec0e057768143b1f4aa0687ecdd3dec1779e6
parent2651ef8c2fd486332457630d459c1e620e626c1b
parentdf13840c794bde4e5418569f8e22f728934a2978
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0