projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 231644e dfd42d2)
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.25
authorCarl Hetherington <cth@carlh.net>
Mon, 21 Oct 2019 16:42:03 +0000 (18:42 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 21 Oct 2019 16:42:03 +0000 (18:42 +0200)

Trivial merge
2.0 development branch of dcpomatic