Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 19 Feb 2015 00:17:37 +0000 (00:17 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 19 Feb 2015 00:17:37 +0000 (00:17 +0000)
commit341f0a81591ab83b96069d6e6bb70cbf8e6cf878
tree2d4be6b4b5a09bffaef43651f97c57951662b0e5
parent688fa9d705a6b23f216f380ac701c6a60e934f70
parent75875c97c079b897e656b72379f9904093a1fe18
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0