projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a681a63 fe2cf02)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 5 Oct 2015 20:03:13 +0000 (21:03 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 5 Oct 2015 20:03:13 +0000 (21:03 +0100)

Trivial merge
2.0 development branch of dcpomatic