projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edecc97 419c025)
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 13 May 2015 22:44:54 +0000 (23:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 13 May 2015 22:44:54 +0000 (23:44 +0100)

Trivial merge
2.0 development branch of dcpomatic