Merge branch '2.0' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 3 Mar 2014 12:55:20 +0000 (12:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 3 Mar 2014 12:55:20 +0000 (12:55 +0000)
commit6d8bcba724be622739a749064466901486304cee
treef8d42b82976bf999eafd1abd499027a5ea5be02e
parent1629bd7df2150156109afbc7a16677cb29e82adf
parent298395454530a7bbcd2ea333d57dff8be8468bba
Merge branch '2.0' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into 2.0