projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b7e2cd 592c784)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic v2.14.12
authorCarl Hetherington <cth@carlh.net>
Fri, 25 Oct 2019 23:03:00 +0000 (01:03 +0200)
committerCarl Hetherington <cth@carlh.net>
Fri, 25 Oct 2019 23:03:00 +0000 (01:03 +0200)

Trivial merge
2.0 development branch of dcpomatic