projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ab437f4
04f8109
)
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
author
Carl Hetherington
<cth@carlh.net>
Sat, 5 Sep 2015 22:22:20 +0000
(23:22 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 5 Sep 2015 22:22:20 +0000
(23:22 +0100)
1
2
wscript
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wscript
Simple merge
projects / dcpomatic.git / commitdiff