Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sat, 16 May 2015 11:18:16 +0000 (12:18 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 16 May 2015 11:18:16 +0000 (12:18 +0100)
commit2307feb984a6d10a332993c8af8d6067237ecc25
tree1f29c2ebae04ce444b01ddf38d331a0807c25483
parentb51d913365ea3ebc57c28d2fdbbe1109ddb86b72
parent0cc6788f4a66b3b70d8791950fabc1ab8dab8361
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0