projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e93c86 c37c744)
Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Oct 2012 23:06:10 +0000 (00:06 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Oct 2012 23:06:10 +0000 (00:06 +0100)

Trivial merge
2.0 development branch of dcpomatic