Alexander Alekhin 9d2eabaaa2 Merge remote-tracking branch 'upstream/master' into merge-4.x		2020-11-27 18:15:28 +00:00
..
doc	Move colorscale_deepgreen.jpg to the correct folder.	2020-10-11 17:18:05 +02:00
fonts	added truetype font support into OpenCV, based on STB_truetype	2020-11-11 22:17:05 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/master' into merge-4.x	2020-11-27 18:15:28 +00:00
misc	Merge remote-tracking branch 'upstream/master' into merge-4.x	2020-11-27 18:15:28 +00:00
perf	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-09-01 20:59:00 +00:00
src	Merge remote-tracking branch 'upstream/master' into merge-4.x	2020-11-27 18:15:28 +00:00
test	added truetype font support into OpenCV, based on STB_truetype	2020-11-11 22:17:05 +03:00
CMakeLists.txt	added truetype font support into OpenCV, based on STB_truetype	2020-11-11 22:17:05 +03:00