projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd1709b 89ee4cc)
Merge branch 'content-burn-subs' into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 25 Jun 2015 12:37:16 +0000 (13:37 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 25 Jun 2015 12:37:16 +0000 (13:37 +0100)

Trivial merge
2.0 development branch of dcpomatic