opencv/modules
Roman Donchenko 6133aeede8 Merge branch 'master' into merge-2.4
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
..
androidcamera Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
bioinspired Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
calib3d fix bug #3277 (findCirclesGrid failures): 2013-09-24 14:45:13 +04:00
contrib hortening the file names (HighDynamicRange -> HDR) 2013-09-26 17:06:06 +04:00
core Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
cuda Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudaarithm Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudabgsegm Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudacodec Merge branch 'master' into gpu-cuda-rename 2013-09-09 12:57:35 +04:00
cudafeatures2d removed precomp.cpp files 2013-09-02 14:00:44 +04:00
cudafilters Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudaimgproc Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudalegacy Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudaoptflow Merge branch 'master' into gpu-cuda-rename 2013-09-04 09:58:32 +04:00
cudastereo Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudawarping Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudev Merge pull request #1299 from jet47:gpu-cuda-rename 2013-09-23 10:31:51 +04:00
features2d remove CV_EXPORT from templates 2013-09-15 13:48:54 +04:00
flann Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
highgui Merge branch 'master' into merge-2.4 2013-10-01 17:37:05 +04:00
imgproc Merge branch 'master' into merge-2.4 2013-10-01 17:37:05 +04:00
java Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
legacy Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
matlab Updated documentation 2013-09-18 18:52:23 +10:00
ml Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
nonfree Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
objdetect erGrouping now uses a classifier for group validation instead of a set of heuristical ifos. 2013-09-27 19:19:45 +02:00
ocl Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
optim fix for broken debug builds (MSVS2010/2012) 2013-09-18 16:05:21 +04:00
photo Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
python expose findEssentialMat, decomposeEssentialMat and recoverPose to Python 2013-09-09 14:02:05 +04:00
softcascade Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
stitching Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
superres Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
ts replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
video Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
videostab Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
viz delete duplicate bunny.ply, remove tabs and extra lines 2013-09-18 13:46:43 +01:00
world Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
refman.rst.in