projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f12bd99
13c0412
)
Merge pull request #3520 from JoeHowse:master
author
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 11:14:29 +0000
(11:14 +0000)
committer
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 11:14:29 +0000
(11:14 +0000)
1
2
modules/videoio/include/opencv2/videoio.hpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/videoio/include/opencv2/videoio.hpp
Simple merge