Andrey Kamaev 0b8a6da817 Merge branch '2.4'

2013-02-22 17:33:30 +04:00

..

cap_ios.h

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

highgui_c.h

Smartek Giganetix Cameras support (Patch #2192) integrated to master.

2013-02-01 16:54:00 +04:00

highgui.hpp

Merge branch '2.4'

2013-02-22 17:33:30 +04:00