Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 12 Dec 2014 09:13:17 +0000 (09:13 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 12 Dec 2014 09:13:17 +0000 (09:13 +0000)
commit20abfe6b7ab3fb7bcadc1134c59612b7f70afceb
tree61a2edf2884aad9709ae6a4060113032bd6e35aa
parentdda0b03a09271fbc3566bff9e0f4cc89fb5433c3
parent1ede0607183bed52a0adfa26a513e5857ecf5a70
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0