projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f8c629 6e1da2e)
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 25 Dec 2020 16:25:14 +0000 (16:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 25 Dec 2020 16:25:14 +0000 (16:25 +0000)
1  2 
platforms/js/build_js.py patch | diff1 | diff2 | blob | history

diff --cc platforms/js/build_js.py
Simple merge
Domain: Multimedia / Media Vision;