Alexander Alekhin dca657a2fd Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-09-10 00:10:21 +03:00
..
include/opencv2	Add export macro for ios conversion functions	2018-08-20 14:10:54 -07:00
misc/java/test	java(test): fix test names	2018-01-12 19:14:00 +00:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-09-10 00:10:21 +03:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-09-04 18:39:03 +00:00
CMakeLists.txt	Merge pull request #12192 from pasbi:pfm	2018-08-13 13:14:12 +03:00