Andrey Kamaev 8dbde3297e Merge branch '2.4'		2012-10-23 20:32:19 +04:00
..
doc	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
include/opencv2/highgui	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
perf	Remove second argument from VideoCapture_Reading perf test	2012-10-10 19:40:19 +04:00
src	Merge branch '2.4'	2012-10-23 20:32:19 +04:00
test	disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW	2012-10-22 21:13:26 +04:00
CMakeLists.txt	#2192 patch apply	2012-10-12 13:03:43 +04:00