projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f33ce8e
d892e43
)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
author
Carl Hetherington
<cth@carlh.net>
Wed, 17 May 2017 22:34:04 +0000
(23:34 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 17 May 2017 22:34:04 +0000
(23:34 +0100)
1
2
src/lib/player.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/lib/player.cc
Simple merge