projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f001159
589d68a
)
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
author
Carl Hetherington
<cth@carlh.net>
Thu, 15 Jan 2015 12:59:38 +0000
(12:59 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 15 Jan 2015 12:59:38 +0000
(12:59 +0000)
Trivial merge