projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
574f011
ab235cd
)
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
author
Roman Donchenko
<roman.donchenko@itseez.com>
Mon, 9 Sep 2013 12:46:32 +0000
(16:46 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Mon, 9 Sep 2013 12:46:33 +0000
(16:46 +0400)
1
2
modules/imgproc/src/smooth.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/include/opencv2/ocl/ocl.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/test/test_imgproc.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/imgproc/src/smooth.cpp
Simple merge
diff --cc
modules/ocl/include/opencv2/ocl/ocl.hpp
Simple merge
diff --cc
modules/ocl/test/test_imgproc.cpp
Simple merge