projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0b8a6da
620c699
)
Merge branch 2.4
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Sun, 24 Feb 2013 16:16:41 +0000
(20:16 +0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Sun, 24 Feb 2013 16:16:53 +0000
(20:16 +0400)
1
2
doc/tutorials/core/adding_images/adding_images.rst
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/src/filtering.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/src/initialization.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
doc/tutorials/core/adding_images/adding_images.rst
Simple merge
diff --cc
modules/ocl/src/filtering.cpp
Simple merge
diff --cc
modules/ocl/src/initialization.cpp
Simple merge
projects / platform / upstream / opencv.git / commitdiff