projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
381986d
7fe7fac
)
Merge pull request #2947 from vbystricky:capDShow
author
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Mon, 14 Jul 2014 18:53:25 +0000
(18:53 +0000)
committer
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Mon, 14 Jul 2014 18:53:25 +0000
(18:53 +0000)
Trivial merge