projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fb0437 4e2623f)
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.21
authorCarl Hetherington <cth@carlh.net>
Sat, 5 Oct 2019 19:27:28 +0000 (21:27 +0200)
committerCarl Hetherington <cth@carlh.net>
Sat, 5 Oct 2019 19:27:28 +0000 (21:27 +0200)

Trivial merge
2.0 development branch of dcpomatic