Andrey Kamaev 7572b4d400 Merge branch '2.4'		2013-01-30 15:12:50 +04:00
..
include/opencv2/ts	Merge pull request #328 from jet47:new-gpu-fixes	2013-01-29 11:00:37 +04:00
misc	Merge pull request #315 from taka-no-me:java_on	2013-01-23 19:02:27 +04:00
src	Merge branch '2.4'	2013-01-30 15:12:50 +04:00
CMakeLists.txt	Add sanity checks support for vertor<KeyPoint>	2012-10-09 18:41:26 +04:00