projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9eca3ec
fb9c59d
)
Merge pull request #1290 from mbarnach:bow_desc
author
Andrey Pavlenko
<andrey.pavlenko@itseez.com>
Tue, 21 Jan 2014 15:22:46 +0000
(19:22 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Tue, 21 Jan 2014 15:22:47 +0000
(19:22 +0400)
1
2
modules/features2d/doc/object_categorization.rst
patch
|
diff1
|
diff2
|
blob
|
history
modules/features2d/include/opencv2/features2d.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/features2d/src/bagofwords.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/features2d/doc/object_categorization.rst
Simple merge
diff --cc
modules/features2d/include/opencv2/features2d.hpp
Simple merge
diff --cc
modules/features2d/src/bagofwords.cpp
Simple merge
projects / platform / upstream / opencv.git / commitdiff