projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aabb40e
ad0bfdf
)
Merge branch 'master' of https://github.com/nevion/opencv into cc
author
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Sat, 15 Dec 2012 17:45:55 +0000
(21:45 +0400)
committer
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Sat, 15 Dec 2012 17:45:55 +0000
(21:45 +0400)
1
2
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
Simple merge