projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3af978d
d37c1c3
)
Merge branch 'master' into subtitle-content
author
Carl Hetherington
<cth@carlh.net>
Sat, 11 Jan 2014 18:59:26 +0000
(18:59 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 11 Jan 2014 18:59:26 +0000
(18:59 +0000)
Trivial merge