marina.kolpakova a6c3ed5b36 Merge branch master into cuda-dev

2012-12-11 01:12:14 +04:00

..

cap_ios.h

Normalize line endings and whitespace

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

highgui_c.h

Revert incompletely applied patch from #2192

2012-12-03 09:55:53 +04:00

highgui.hpp

refactored opengl functionality

2012-11-30 17:35:28 +04:00