projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0556fc9 2b7a21d)
Merge branch 'prefs' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into prefs
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:14:49 +0000 (00:14 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:14:49 +0000 (00:14 +0000)

Trivial merge
2.0 development branch of dcpomatic