projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf5e1fe 6635d4c)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 20 Aug 2017 23:24:42 +0000 (00:24 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 20 Aug 2017 23:24:42 +0000 (00:24 +0100)

Trivial merge
2.0 development branch of dcpomatic