Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 13 Feb 2015 16:32:40 +0000 (16:32 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 13 Feb 2015 16:32:40 +0000 (16:32 +0000)
commit66aacf282bb6e76e7e2f2d2ab6be15910d9bdaf9
treeb5bfcb0db2de78734c983617b389123ee54a251e
parent2594a8d025743a32b0ae49f7cece85d1ba7c8848
parent6f3789254bb482f300665752f663ca2a19ce3feb
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0