projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 122eccd 816b3c2)
Merge branch 'master' into prefs
authorCarl Hetherington <cth@carlh.net>
Sun, 16 Mar 2014 22:30:27 +0000 (22:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 16 Mar 2014 22:30:27 +0000 (22:30 +0000)

Trivial merge
2.0 development branch of dcpomatic