projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91273da 7370f2b)
Merge branch '1.0-alt-loop' into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 19 Jul 2013 12:47:34 +0000 (13:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 19 Jul 2013 12:47:34 +0000 (13:47 +0100)

Trivial merge
2.0 development branch of dcpomatic