projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8c860b 40821cb)
Merge branch 'dist' of git://git.carlh.net/git/dcpomatic into dist
authorCarl Hetherington <cth@carlh.net>
Sun, 5 Apr 2020 22:36:09 +0000 (00:36 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 5 Apr 2020 22:36:09 +0000 (00:36 +0200)

Trivial merge
2.0 development branch of dcpomatic