projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24b8387 99ef355)
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Sep 2015 23:12:16 +0000 (00:12 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Sep 2015 23:12:16 +0000 (00:12 +0100)

Trivial merge
2.0 development branch of dcpomatic