projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14b3b94 bfe277e)
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Jan 2015 20:30:31 +0000 (20:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Jan 2015 20:30:31 +0000 (20:30 +0000)

Trivial merge
2.0 development branch of dcpomatic