LaurentBerger 48e2d38be7 Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap		2017-01-28 11:25:11 +01:00
..
doc	Fix rho,phi exchange and amend linearPolar & logPolar docs with details and pics.	2016-08-16 12:49:33 +02:00
include/opencv2	Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap	2017-01-28 11:25:11 +01:00
misc/java	java tests fixes	2016-11-23 13:53:00 +03:00
perf	test: update HoughLines perf test	2016-10-20 16:54:35 +03:00
src	Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap	2017-01-28 11:25:11 +01:00
test	Merge pull request #7812 from alalek:fix_putText	2016-12-15 13:33:56 +00:00
CMakeLists.txt	Python support	2015-03-02 18:13:00 +03:00