MYLS 3935855365 Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests ... # Conflicts: # modules/core/test/test_io.cpp		2016-07-30 01:08:27 +08:00
..
calib3d	calib3d: fix typo	2016-07-26 12:56:10 +09:00
core	Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests	2016-07-30 01:08:27 +08:00
cudaarithm	clarify CUDA arithm operations usage with mask	2016-07-12 13:32:58 +03:00
cudabgsegm
cudacodec
cudafeatures2d	fix matrix type for keypoints buffer in CUDA FAST	2016-07-06 14:27:08 +03:00
cudafilters
cudaimgproc
cudalegacy	fix build #6993	2016-07-27 11:21:08 +02:00
cudaobjdetect
cudaoptflow	Merge pull request #6940 from andy-held:cuda_pyrlk_static_const_init	2016-07-19 08:47:57 +00:00
cudastereo
cudawarping
cudev
features2d	Merge pull request #6822 from saedrna:master	2016-07-19 15:37:31 +00:00
flann	fixed memory leak in flann tests	2016-07-12 11:53:51 +03:00
highgui	highgui: window QT+OpenGL mouse wheel support, another build fix	2016-07-27 16:14:57 +02:00
imgcodecs	Merge pull request #6839 from thierrylamarre:better_png_transparency	2016-07-18 18:24:34 +00:00
imgproc	Merge pull request #6989 from mself:gftt-deterministic-sort	2016-07-28 15:27:39 +00:00
java	Merge pull request #6815 from smigielski:fix_6605	2016-07-14 14:36:45 +00:00
ml	Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests	2016-07-30 01:08:27 +08:00
objdetect	Merge pull request #6797 from tomoaki0705:featureSIMDHog	2016-07-18 18:34:21 +00:00
photo	fix a bug in MergeDebevec (modify input times)	2016-07-26 18:01:36 +02:00
python	Merge pull request #6884 from alalek:migration	2016-07-18 07:49:38 +00:00
shape
stitching	fix build: move LOG macro from stitching public headers	2016-07-20 18:10:26 +03:00
superres
ts	imgproc test: Canny with custom gradient	2016-07-19 17:15:36 +03:00
video	Merge pull request #6849 from alcinos:optflow_interface	2016-07-18 15:05:13 +00:00
videoio	Merge pull request #6899 from alalek:ffmpeg_update	2016-07-21 07:31:11 +00:00
videostab
viz
world
CMakeLists.txt