Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 21 Jan 2015 10:19:11 +0000 (10:19 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 21 Jan 2015 10:19:11 +0000 (10:19 +0000)
commit73ccfce6ef220b1c3a562a0af86edbc435ed8f6a
treeb31d8ca9141c5515a0e13f208081d159e832ae76
parent03c845f85cbf795ee2c1099e516d56783340f741
parent08e6cee55742ff4fc372435115330ba5b90c40fd
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0