projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7e0814 dbd3042)
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 25 Aug 2014 00:45:51 +0000 (01:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 25 Aug 2014 00:45:51 +0000 (01:45 +0100)

Trivial merge
2.0 development branch of dcpomatic