Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 5 Aug 2015 17:36:26 +0000 (18:36 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 5 Aug 2015 17:36:26 +0000 (18:36 +0100)
commit56bc3aa3907594b69a1c6c1cd58213d68657a1ff
treef4c2b7356468d8c376f35ec31cec698fafd0a83a
parent3cfa54a879ebad50ceb8dd472412f53b4e0e7ee6
parent7582d18fb6b27a691f270522b98ce18c0f68356b
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0