projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fcaaf1 9ad15a5)
Merge branch 'master' into trimming
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Apr 2013 09:07:27 +0000 (10:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Apr 2013 09:07:27 +0000 (10:07 +0100)

Trivial merge
2.0 development branch of dcpomatic