Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 16 Jan 2015 01:09:21 +0000 (01:09 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Jan 2015 01:09:21 +0000 (01:09 +0000)
commit27173512f4ea4f2c324b9488180ba7cbd7173ec3
tree6f96020d56c4fda3fded24e82a61888db1c47cf6
parent9bc93a8b7a996916cfa38baab2cbcfc4c5f40af4
parenta01f72d930b18dfef8487303d49be15e3cce7f2a
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0