projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 438db1b 817cc13)
Fix merge.
authorCarl Hetherington <cth@carlh.net>
Thu, 13 Dec 2012 21:51:26 +0000 (21:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 13 Dec 2012 21:51:26 +0000 (21:51 +0000)

Trivial merge
2.0 development branch of dcpomatic