projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e355e7 ee0f221)
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.31
authorCarl Hetherington <cth@carlh.net>
Fri, 8 Nov 2019 22:55:34 +0000 (23:55 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 8 Nov 2019 22:55:34 +0000 (23:55 +0100)

Trivial merge
2.0 development branch of dcpomatic