projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6e3a05 737c339)
Fix merge.
authorCarl Hetherington <cth@carlh.net>
Sun, 23 Sep 2012 17:46:09 +0000 (18:46 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 23 Sep 2012 17:46:09 +0000 (18:46 +0100)

Trivial merge
2.0 development branch of dcpomatic