projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54e0e2a b3de36f)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic v2.13.38
authorCarl Hetherington <cth@carlh.net>
Tue, 24 Jul 2018 11:14:32 +0000 (12:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 24 Jul 2018 11:14:32 +0000 (12:14 +0100)

Trivial merge
2.0 development branch of dcpomatic