Alexander Alekhin 55188fe991 world fix		2014-08-05 20:12:35 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-14 16:08:02 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-14 16:08:02 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-14 16:08:02 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-14 16:08:02 +04:00
CMakeLists.txt	world fix	2014-08-05 20:12:35 +04:00