Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 25 Aug 2014 00:45:51 +0000 (01:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 25 Aug 2014 00:45:51 +0000 (01:45 +0100)
commite69d12427d19a6d1255c2275478a9574a9f7972a
tree02734ca0f6a083391bc08fef926311b96d07c054
parentf7e08142ac695b2a839707f9bac66304a583b0cd
parentdbd3042f2fcd2319c45c1142c640b173b037abe0
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0