projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b6c6de 2a80f30)
Merge branch 'master' into 12bit
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:44:47 +0000 (16:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:44:47 +0000 (16:44 +0100)

Trivial merge
2.0 development branch of dcpomatic