projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52a785e
6f3163f
)
Merge pull request #1881 from pentschev:defaultNorm_master
author
Roman Donchenko
<roman.donchenko@itseez.com>
Tue, 17 Dec 2013 09:53:59 +0000
(13:53 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Tue, 17 Dec 2013 09:53:59 +0000
(13:53 +0400)
1
2
modules/features2d/include/opencv2/features2d.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/features2d/src/freak.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/features2d/src/orb.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/features2d/include/opencv2/features2d.hpp
Simple merge
diff --cc
modules/features2d/src/freak.cpp
Simple merge
diff --cc
modules/features2d/src/orb.cpp
Simple merge
projects / platform / upstream / opencv.git / commitdiff