[opencv] 52/53: Merge pull request #9266 from alalek:backport_9238

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.3
in repository opencv.

commit a0520bef42739ed9d69c76f4b6587482d3a5431d
Merge: d19147b 7dceebb
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Sun Jul 30 14:38:07 2017 +0000

    Merge pull request #9266 from alalek:backport_9238
    
    (2.4) backport #9238

 cmake/OpenCVCompilerOptions.cmake               |  5 ++++-
 modules/flann/include/opencv2/flann/lsh_table.h | 25 ++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git