projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e4cb56 f7661f4)
Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Sat, 12 Oct 2013 15:59:02 +0000 (16:59 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 12 Oct 2013 15:59:02 +0000 (16:59 +0100)

Trivial merge
2.0 development branch of dcpomatic