Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 1 Jun 2015 22:42:57 +0000 (23:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 1 Jun 2015 22:42:57 +0000 (23:42 +0100)
commite12d6f79ca85a71d30abbd3c167a0747b2ae5bb1
treec9fb0995c3b582b84f34023a3457806cd864c22f
parent972cdd8a1c2d6d06d8d968ebb947fb48619fb829
parentc06df9e7bbd0f13d1355816b80f1a5d3ec1231b0
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0