projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cfc4621
75b80e5
)
Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode
author
Roman Donchenko
<roman.donchenko@itseez.com>
Wed, 19 Feb 2014 10:48:56 +0000
(14:48 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Wed, 19 Feb 2014 10:48:57 +0000
(14:48 +0400)
1
2
modules/highgui/include/opencv2/highgui.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/highgui/include/opencv2/highgui/highgui_c.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/highgui/include/opencv2/highgui.hpp
Simple merge
diff --cc
modules/highgui/include/opencv2/highgui/highgui_c.h
Simple merge
projects / profile / ivi / opencv.git / commitdiff