Andrey Kamaev 956aa68fb5 Merge branch '2.4'		2013-02-12 20:30:17 +04:00
..
doc	Merge branch '2.4'	2013-02-01 14:59:40 +04:00
include/opencv2/highgui	Smartek Giganetix Cameras support (Patch #2192) integrated to master.	2013-02-01 16:54:00 +04:00
perf	Video IO perf tests guarded.	2013-01-29 11:09:49 +04:00
src	Merge branch '2.4'	2013-02-12 20:30:17 +04:00
test	Temporary disabled parallel_writers_and_readers test	2013-02-11 16:52:20 +04:00
CMakeLists.txt	Smartek Giganetix Cameras support (Patch #2192) integrated to master.	2013-02-01 16:54:00 +04:00