Merge branch 'master' of git.carlh.net:git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Oct 2014 09:27:56 +0000 (10:27 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Oct 2014 09:27:56 +0000 (10:27 +0100)
commit360f49fad409d1e37318ffcf3069c4111c19c7b8
treee872689ec14485630f52eddc142bd1924eed1ae7
parent1b4bb48ed28295f7c647adca041cc29fb061b2a1
parentbccbbe081b484f48101d76ec52aee922efa2fc50
Merge branch 'master' of git.carlh.net:git/dcpomatic