1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

Merge remote-tracking branch 'upstream/master' into merge-4.x

This commit is contained in:
Alexander Alekhin
2020-11-27 18:14:53 +00:00
457 changed files with 30205 additions and 4172 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif