Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 21:26:26 +0000 (22:26 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 21:26:26 +0000 (22:26 +0100)
commit2898a88b4554335439891d8198bed8c820c20396
tree8628745874397d02b4f646caad1a3b40fc41db64
parent06959faf429d1118e16e71900148c1ba16118be4
parentcec1f7a6a7c6622f37c8bfae36b1a72aefbfe339
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0