projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8acd8bd
1deb610
)
Merge remote-tracking branch 'origin/master' into 2.0
author
Carl Hetherington
<cth@carlh.net>
Wed, 10 Sep 2014 14:44:24 +0000
(15:44 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 10 Sep 2014 14:44:24 +0000
(15:44 +0100)
1
2
src/wx/config_dialog.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/wx/config_dialog.cc
Simple merge