Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2015 16:55:08 +0000 (17:55 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2015 16:55:08 +0000 (17:55 +0100)
commitde55fefe3f977a3552e95400c0e9f5183c14a181
tree54b382935975e0a17d723b3d1fefdf52dbafd7b7
parent9f1deb2a9cd1565f7f195b1601bbf6ddb81ae950
parent20a733fe6782eff04622b5bd189417f391b9cfb9
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0