projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
409db67
1c86e1e
)
Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
author
Carl Hetherington
<cth@carlh.net>
Fri, 28 Jun 2013 08:47:55 +0000
(09:47 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 28 Jun 2013 08:47:55 +0000
(09:47 +0100)
1
2
src/lib/film.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/lib/film.cc
Simple merge