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
..
perf	Merge pull request #18073 from vpisarev:apache2_license	2020-08-17 11:49:11 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-11-11 20:25:42 +00:00
test	Merge pull request #18073 from vpisarev:apache2_license	2020-08-17 11:49:11 +00:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-09-25 18:32:44 +00:00