projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e06203 8ed59c2)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic v2.13.70
authorCarl Hetherington <cth@carlh.net>
Sat, 10 Nov 2018 00:38:35 +0000 (00:38 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 10 Nov 2018 00:38:35 +0000 (00:38 +0000)

Trivial merge
2.0 development branch of dcpomatic