• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 95c2e8b5
    Roman Donchenko authored
    Conflicts:
    	.gitignore
    	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
    	modules/gpu/src/match_template.cpp
    	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/perf/perf_precomp.hpp
    95c2e8b5
Name
Last commit
Last update
..
all_indices.h Loading commit data...
allocator.h Loading commit data...
any.h Loading commit data...
autotuned_index.h Loading commit data...
composite_index.h Loading commit data...
config.h Loading commit data...
defines.h Loading commit data...
dist.h Loading commit data...
dummy.h Loading commit data...
dynamic_bitset.h Loading commit data...
flann.hpp Loading commit data...
flann_base.hpp Loading commit data...
general.h Loading commit data...
ground_truth.h Loading commit data...
hdf5.h Loading commit data...
heap.h Loading commit data...
hierarchical_clustering_index.h Loading commit data...
index_testing.h Loading commit data...
kdtree_index.h Loading commit data...
kdtree_single_index.h Loading commit data...
kmeans_index.h Loading commit data...
linear_index.h Loading commit data...
logger.h Loading commit data...
lsh_index.h Loading commit data...
lsh_table.h Loading commit data...
matrix.h Loading commit data...
miniflann.hpp Loading commit data...
nn_index.h Loading commit data...
object_factory.h Loading commit data...
params.h Loading commit data...
random.h Loading commit data...
result_set.h Loading commit data...
sampling.h Loading commit data...
saving.h Loading commit data...
simplex_downhill.h Loading commit data...
timer.h Loading commit data...