Vadim Pisarevsky 5108e3ced6 Merge pull request #18073 from vpisarev:apache2_license ... changed OpenCV license from BSD to Apache 2 license * as discussed and announced earlier, changed OpenCV license from BSD to Apache 2. Many files still contain old-style copyrights though * changed wording a bit; preserve the original OpenCV BSD license		2020-08-17 11:49:11 +00:00
..
3rdparty/SoftFloat
doc	Merge pull request #18073 from vpisarev:apache2_license	2020-08-17 11:49:11 +00:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-08-06 14:15:52 +00:00
misc	Merge pull request #18059 from komakai:improve-swift-docs	2020-08-10 20:28:41 +00:00
perf	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-04-02 21:52:32 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-08-14 19:45:45 +00:00
test	core(persistence): fix "use after free" bug	2020-07-17 21:39:06 +00:00
CMakeLists.txt	Merge pull request #17165 from komakai:objc-binding	2020-06-08 18:32:53 +00:00