projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad10aea f53ef1b)
Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 20:48:34 +0000 (20:48 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 20:48:34 +0000 (20:48 +0000)

Trivial merge
2.0 development branch of dcpomatic