projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
46ac004
7134865
)
Merge pull request #3217 from avdmitry:samples_cpp_data
author
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 14:57:45 +0000
(14:57 +0000)
committer
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 14:57:46 +0000
(14:57 +0000)
1
2
doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.rst
patch
|
diff1
|
diff2
|
blob
|
history
doc/tutorials/introduction/display_image/display_image.rst
patch
|
diff1
|
diff2
|
blob
|
history
samples/cpp/tutorial_code/features2D/AKAZE_match.cpp
patch
|
diff1
|
diff2
|
blob
|
history
samples/tapi/hog.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.rst
Simple merge
diff --cc
doc/tutorials/introduction/display_image/display_image.rst
Simple merge
diff --cc
samples/cpp/tutorial_code/features2D/AKAZE_match.cpp
Simple merge
diff --cc
samples/tapi/hog.cpp
Simple merge