projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ada1c70
760cc7d
)
Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
author
Carl Hetherington
<cth@carlh.net>
Mon, 31 Aug 2015 17:56:25 +0000
(18:56 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 31 Aug 2015 17:56:25 +0000
(18:56 +0100)
Trivial merge