projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ff6697 7106334)
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 03:05:06 +0000 (03:05 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 03:05:06 +0000 (03:05 +0000)

Trivial merge
2.0 development branch of dcpomatic