Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 02:14:48 +0000 (02:14 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 02:14:48 +0000 (02:14 +0000)
commita28253ce511913781db472958fb10259f0d215ad
tree43970a5f08551a9144d1060c62cf7449fda3b42b
parent2c2aa91347c0016e6393fc138afe68adab3d6d21
parent18bb7f1b92b3f63160cfd1ff75faa5458fbd7df3
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0