Andrey Kamaev 61079547f0 Merge branch '2.4'		2013-02-01 14:59:40 +04:00
..
doc	Merge branch 2.4	2013-01-17 18:39:20 +04:00
include/opencv2/flann	Merge branch '2.4'	2013-02-01 14:59:40 +04:00
src	Merge branch '2.4'	2012-10-23 20:32:19 +04:00
test	Added a test for invalid key sizes in LSH tables	2013-01-31 23:17:07 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00