Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 10 Sep 2015 08:54:06 +0000 (09:54 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 10 Sep 2015 08:54:06 +0000 (09:54 +0100)
commit0f808c885d010958ff8f1bfefc168d2e5d338a12
treee6d0f2f46e2cf92fa27fb48fdd59ebcc63ca66b1
parentf4eb069eb71969397c2066130c8f501de0fe9846
parentbf3561e1f773345e3c835e9b4cb3dcb103e564cf
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0