projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 0079959 1f7717c)
Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 7 Jul 2015 15:05:53 +0000 (16:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 7 Jul 2015 15:05:53 +0000 (16:05 +0100)

Trivial merge
2.0 development branch of dcpomatic