projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cb5f05 6d69684)
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 23 Jul 2014 09:40:26 +0000 (10:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 23 Jul 2014 09:40:26 +0000 (10:40 +0100)

Trivial merge
2.0 development branch of dcpomatic