Merge pull request #3217 from avdmitry:samples_cpp_data
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 14:57:45 +0000 (14:57 +0000)
committerVadim 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
doc/tutorials/introduction/display_image/display_image.rst
samples/cpp/tutorial_code/features2D/AKAZE_match.cpp
samples/tapi/hog.cpp

Simple merge