projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4eb069 bf3561e)
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 10 Sep 2015 08:54:06 +0000 (09:54 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 10 Sep 2015 08:54:06 +0000 (09:54 +0100)

Trivial merge
2.0 development branch of dcpomatic