projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d07c424 7ccd46e)
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.55
authorCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2020 23:50:54 +0000 (01:50 +0200)
committerCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2020 23:50:54 +0000 (01:50 +0200)

Trivial merge
2.0 development branch of dcpomatic