Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)
commit1cdedd1c19bd34f1c41043f9bbeae39cb54a0ed8
tree460ee0ad60988d641cf00e458fef6c91e3621370
parent666808c7f735d5ff0daff70dfb7b0c409113874e
parent2d3092216e97c02bf715a3df19725518312a0b65
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
TO_PORT