Roman Donchenko 58da54cb7a Cherry-picked mariusmuja/flann@8c8b0e0cb8. ... Original author: me.		2013-10-02 16:09:45 +04:00
..
doc	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
include/opencv2	Cherry-picked mariusmuja/flann@8c8b0e0cb8.	2013-10-02 16:09:45 +04:00
src	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
CMakeLists.txt	Normalized file endings.	2013-08-21 18:59:25 +04:00