projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3409c7f 368121d)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 11 Jan 2018 00:45:29 +0000 (00:45 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 11 Jan 2018 00:45:29 +0000 (00:45 +0000)

Trivial merge
2.0 development branch of dcpomatic