Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 11 Jan 2015 22:59:59 +0000 (22:59 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 11 Jan 2015 22:59:59 +0000 (22:59 +0000)
commitfae6eb8054d556adf03674d40cade4d8656ab1c1
treecce3c3df2bc675c3f00e2b27688e95e0a7f9db60
parentfbc0f098149febf822e4e53d6026120e6a273be8
parent188ba79e36a626eb7481ceb2ef87d6fbf7da98a2
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0