projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28e15a7 58ee8e3)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 16 Aug 2017 23:41:45 +0000 (00:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 16 Aug 2017 23:41:45 +0000 (00:41 +0100)

Trivial merge
2.0 development branch of dcpomatic