projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21abc93 4542d9e)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Jan 2018 00:00:24 +0000 (00:00 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Jan 2018 00:00:24 +0000 (00:00 +0000)

Trivial merge
2.0 development branch of dcpomatic