Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 15 Jan 2015 10:27:10 +0000 (10:27 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 15 Jan 2015 10:27:10 +0000 (10:27 +0000)
commitefa498c9150f0d2f987a087357fe7e25d385d214
tree393f5c8d298a87e5e3d41b4876e395b7298e975c
parentcf480e869ca654e771f9f88d766ad72c20d38712
parent1b645ef543ba671724f98bd759966dc2d01400ea
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0