projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30661f2
60febeb
)
Merge branch 'master' of git.carlh.net:git/dcpomatic
author
Carl Hetherington
<cth@carlh.net>
Thu, 16 Oct 2014 09:39:31 +0000
(10:39 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 16 Oct 2014 09:39:31 +0000
(10:39 +0100)
1
2
wscript
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wscript
Simple merge