projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 052ec34 79313d6)
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.29
authorCarl Hetherington <cth@carlh.net>
Mon, 4 Nov 2019 21:05:24 +0000 (22:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 4 Nov 2019 21:05:24 +0000 (22:05 +0100)

Trivial merge
2.0 development branch of dcpomatic