Roman Donchenko 0736ede7e5 Merge pull request #1914 from SpecLad:merge-2.4		2013-12-04 16:30:57 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-19 16:21:09 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
perf	perf: test-based metrics collection strategy	2013-12-03 18:43:50 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
CMakeLists.txt	ocl: don't disable Undef warnings	2013-11-22 18:24:50 +04:00