projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3cfa54a
7582d18
)
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
author
Carl Hetherington
<cth@carlh.net>
Wed, 5 Aug 2015 17:36:26 +0000
(18:36 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 5 Aug 2015 17:36:26 +0000
(18:36 +0100)
Trivial merge