Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 7 May 2015 11:54:04 +0000 (12:54 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 7 May 2015 11:54:04 +0000 (12:54 +0100)
commit0463cc5d09fd759a8ec3e40560ab8fd31c369876
treeab2eaba3a7f939017c387e4765eb104ab81064b7
parent21fb4ee6deb1321b37ad360cabdc8963774a4897
parent3c5905314398833aafa54a91c59c16e4e0d87d8c
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0