Merge pull request #9004 from alalek:fix_build_flann_sdl
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 27 Jun 2017 14:05:23 +0000 (14:05 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 27 Jun 2017 14:05:23 +0000 (14:05 +0000)

Trivial merge