projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d69b8e 03b5413)
Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 10:45:24 +0000 (10:45 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 10:45:24 +0000 (10:45 +0000)

Trivial merge
2.0 development branch of dcpomatic