projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1db495 dc23572)
Merge branch '1.0' into 1.0-multiple-selection
authorCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2013 10:38:01 +0000 (10:38 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2013 10:38:01 +0000 (10:38 +0000)

Trivial merge
2.0 development branch of dcpomatic