projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5e08d58
156871d
)
Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
author
LaurentBerger
<laurent.berger@univ-lemans.fr>
Sat, 28 Jan 2017 10:25:11 +0000
(11:25 +0100)
committer
LaurentBerger
<laurent.berger@univ-lemans.fr>
Sat, 28 Jan 2017 10:25:11 +0000
(11:25 +0100)
1
2
modules/imgproc/include/opencv2/imgproc.hpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/imgproc/include/opencv2/imgproc.hpp
Simple merge