Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 16 Jan 2015 09:35:43 +0000 (09:35 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Jan 2015 09:35:43 +0000 (09:35 +0000)
commitd786e01fdaed5866ca72cbcf15ec5aa9a1a8fdf2
tree6f96020d56c4fda3fded24e82a61888db1c47cf6
parente4136f856a86a24f2494c069cc0288c6ae0108e7
parent27173512f4ea4f2c324b9488180ba7cbd7173ec3
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0