projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2b41105
50e6acd
)
Merge branch 'staging'
author
Carl Hetherington
<cth@carlh.net>
Mon, 8 Jul 2013 22:23:07 +0000
(23:23 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 8 Jul 2013 22:23:07 +0000
(23:23 +0100)
1
2
src/wx/film_editor.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/wx/film_editor.cc
Simple merge