projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
262fc92
6ebb0e2
)
Merge branch '2.4'
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Wed, 20 Feb 2013 08:31:16 +0000
(12:31 +0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Wed, 20 Feb 2013 08:31:16 +0000
(12:31 +0400)
1
2
modules/core/src/matrix.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/include/opencv2/ocl/ocl.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/video/doc/motion_analysis_and_object_tracking.rst
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/core/src/matrix.cpp
Simple merge
diff --cc
modules/ocl/include/opencv2/ocl/ocl.hpp
Simple merge
diff --cc
modules/video/doc/motion_analysis_and_object_tracking.rst
Simple merge