Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 7 Jan 2015 12:57:59 +0000 (12:57 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 7 Jan 2015 12:57:59 +0000 (12:57 +0000)
commit228fbab81a5f093e9265d565c1110582c363def3
treef9d898047ed366ae33ed7501da4e4d0e09d1d8b1
parent77f7f3be256f81d2977bccdb236582e18a625ba7
parent385dacb34644a503c1e77a2d1365f7f65d1c0458
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0