Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 9 Sep 2014 21:48:28 +0000 (22:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 9 Sep 2014 21:48:28 +0000 (22:48 +0100)
commitafa94abdc7db37b1fd9919665445c2b89ce4ec7a
treecac59382ded1aeb286d9fdae4bc6e718cfd235c3
parente80e6a8567dd107f5ea3b708975cb5fd92112a57
parent6f07182a2a98474a7d0f0bdc907efb542a49ecdf
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0