projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1895cfd
7d262f9
)
Merge branch 'master' of /home/carl/git/dvdomatic
author
Carl Hetherington
<cth@carlh.net>
Tue, 12 Mar 2013 22:29:20 +0000
(22:29 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 12 Mar 2013 22:29:20 +0000
(22:29 +0000)
1
2
src/tools/dvdomatic.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/tools/dvdomatic.cc
Simple merge