Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 15 Jan 2015 12:59:38 +0000 (12:59 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 15 Jan 2015 12:59:38 +0000 (12:59 +0000)
commite4136f856a86a24f2494c069cc0288c6ae0108e7
tree4f6ede9b14e96d738d8bdd963868e6efe20a73e5
parentf001159b37089e53895997c83a4ce141d969889d
parent589d68a7f13767dab5594c160a10f0cfea01cf5b
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0