Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 8 Jul 2015 23:51:06 +0000 (00:51 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 8 Jul 2015 23:51:06 +0000 (00:51 +0100)
commitb7911b6da3eb53fe7a87a5abd05c20026f2d865d
treec2f1ef50edb544237ebadcc87a2df3c44baf2d95
parenta04e7f3054f0d99c8f54863142d096bc655a4bc9
parentf0144040f62b94908f5d3198e2fcc8ebc60dfba1
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0