Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 23 Jul 2014 09:40:26 +0000 (10:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 23 Jul 2014 09:40:26 +0000 (10:40 +0100)
commit545e94c62f23f7a6225cfa97a91cd9a9258731a1
tree49a122950d30b3137fd8cb6c74be68121c548afc
parent2cb5f05397b115bda11d8f86a62a3f30d8e2ea71
parent6d69684f9e95d629bad663667e5fb7205570e6d5
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0