projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05687b4 01502a0)
Merge branch '1.0' into kdms
authorCarl Hetherington <cth@carlh.net>
Tue, 24 Sep 2013 20:13:02 +0000 (21:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 24 Sep 2013 20:13:02 +0000 (21:13 +0100)

Trivial merge
2.0 development branch of dcpomatic