projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 332ad44 615a076)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 16 Dec 2016 10:02:16 +0000 (10:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Dec 2016 10:02:16 +0000 (10:02 +0000)

Trivial merge
2.0 development branch of dcpomatic