Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 12 Nov 2014 23:13:58 +0000 (23:13 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 12 Nov 2014 23:13:58 +0000 (23:13 +0000)
commitbf7d89546d4bbc155d4367a7bd5f3e17fa08369a
tree566b9335bbbc20bb88f4a869401bf40ee1f427d4
parent047f0c6a7fed251ed05f617d740787dcc83c98f7
parentf1cc295189c1db0e9a72093499b3c859218319e7
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0