projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc4d3a9 658ce42)
Merge.
authorCarl Hetherington <cth@carlh.net>
Sun, 12 Feb 2012 02:02:09 +0000 (02:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 12 Feb 2012 02:02:09 +0000 (02:02 +0000)

Trivial merge
Development branch of dcpomatic