Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 30 Apr 2015 16:58:39 +0000 (17:58 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 30 Apr 2015 16:58:39 +0000 (17:58 +0100)
commit895e908f7dcc8deb9e6a333d3d6b3a92aec2dc09
tree663ce37c03a8493e7d2ccfbecd346ecade113c77
parent963003fb0eec0e2064674583d9938fba615296a7
parent920bbd068a0868bbec7da57724aaf1c14e8b3795
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0