projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c2aa91 18bb7f1)
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 02:14:48 +0000 (02:14 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 02:14:48 +0000 (02:14 +0000)

Trivial merge
2.0 development branch of dcpomatic