projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b22232 8d39a3e)
Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Thu, 19 Dec 2013 17:49:51 +0000 (17:49 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 19 Dec 2013 17:49:51 +0000 (17:49 +0000)

Trivial merge
2.0 development branch of dcpomatic