Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sat, 17 Jan 2015 01:49:17 +0000 (01:49 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 17 Jan 2015 01:49:17 +0000 (01:49 +0000)
commita3997a2b3ca4ff0c3dd5e7f5038cd5633ea75eee
tree2173755002ddf7e024e8d6579bc0483830c94f0c
parent27a6832bb66ff9b9cebf4cbd1abcd374bad48c8c
parent75b64823daa2f4c074a989405581f05ecd1f6e74
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0