Andrey Kamaev 61079547f0 Merge branch '2.4'		2013-02-01 14:59:40 +04:00
..
doc	Merge branch '2.4'	2013-02-01 14:59:40 +04:00
include/opencv2/highgui	Merge branch master into cuda-dev	2012-12-11 01:12:14 +04:00
perf	Video IO perf tests guarded.	2013-01-29 11:09:49 +04:00
src	Merge branch '2.4'	2013-01-31 14:35:27 +04:00
test	Merge branch '2.4'	2013-02-01 14:59:40 +04:00
CMakeLists.txt	Merge branch '2.4'	2013-01-30 15:12:50 +04:00