Merge remote-tracking branch 'origin/2.4' into merge-2.4
[profile/ivi/opencv.git] / include / opencv2 /
drwxr-xr-x   ..
-rw-r--r-- 2528 opencv.hpp