2 Commits

Author	SHA1	Message	Date
Alexander Alekhin	0d7f770996	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-11-04 09:58:29 +00:00
Dizhenin Vlad	edc5518f68	Merge pull request #15608 from SimpleVlad:3.4 ... * Add flags for build js * Add poi.json * Rebase whitelist into JSON file * Rework generator of white_list * Fix small typos * Transfer opencv_js.josn in opencv_js.config.py * Edit OPENCV_JS_WHITELIST * Write comment * Add description * Fix typos in desc * flag's append deleeted * Fix whitespace * variable deleted * fix comment on lines 229 and 235	2019-10-31 22:09:33 +03:00