Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 1 Sep 2015 09:31:21 +0000 (10:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 1 Sep 2015 09:31:21 +0000 (10:31 +0100)
commitb0297f77b23099a52d37becfa45930ee730bda4b
tree39782dd3f20529eda2c46b1f3bd780c99552c576
parent4685843ba4194d8b59ed6eb1335ae27052178726
parentca0dcebfdcf14d1900f8be0916e7ff5e1940521c
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0