Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 13 Jul 2015 23:29:28 +0000 (00:29 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 13 Jul 2015 23:29:28 +0000 (00:29 +0100)
commita6a4671df0a6405f1ec8b03eebab90f55c909625
tree4e24410bdd1eae4ce293b2921fad0f1eb6d86f63
parent6c3ce5b236a745c9eb9e652bacb2896a96254f81
parent37b1945ffd8c9b3084d08dbdc274c8841d9162eb
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0