Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 13 Nov 2014 11:08:21 +0000 (11:08 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 13 Nov 2014 11:08:21 +0000 (11:08 +0000)
commitbf193143624df4cf3a49c99bda1955484051c722
tree3f4d021b82f00bb54af6e0622dcfd306c8d8e7de
parent59a87a29043d29907c389b9fca7b5865bc0bdf84
parent7038c43087a007548e9de5e07057a27fcf0f07e9
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0