projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4426c01 57ad1c0)
Merge branch 'video-player'
authorCarl Hetherington <cth@carlh.net>
Sun, 23 Dec 2012 02:06:13 +0000 (02:06 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 23 Dec 2012 02:06:13 +0000 (02:06 +0000)

Trivial merge
Development branch of dcpomatic