projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf4273c
9b98a07
)
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
author
Carl Hetherington
<cth@carlh.net>
Thu, 30 May 2019 21:33:35 +0000
(22:33 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 30 May 2019 21:33:35 +0000
(22:33 +0100)
1
2
test/recover_test.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/recover_test.cc
Simple merge