Merge branch 'master' of git.carlh.net:git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:47:05 +0000 (16:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:47:05 +0000 (16:47 +0100)
commita65d08d8a4e84b1f2321154fc4b16384dcd6b10f
tree7a2eabc2a2b32fca7aa9b8a0f2470d039637294b
parent784440c45ee7469890a15ed612018eb66c2152dc
parent61ba36e642cca1efe5e1e5352d995df351e97e91
Merge branch 'master' of git.carlh.net:git/dcpomatic