opencv/modules
Roman Donchenko 659d21332e Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/spinimages.cpp
2014-06-09 18:03:03 +04:00
..
androidcamera Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-24 19:02:16 +04:00
calib3d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
contrib Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-06-09 18:03:03 +04:00
core Merge pull request #2755 from vbystricky:oclopt_LUT 2014-06-06 18:52:40 +04:00
cuda Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-07 14:59:34 +04:00
cudaarithm fix bug #3678 (cuda::integral failures) 2014-05-14 12:48:12 +04:00
cudabgsegm Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-07 14:59:34 +04:00
cudacodec Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudafeatures2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-11 17:20:01 +04:00
cudafilters Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudaimgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-11 17:20:01 +04:00
cudalegacy Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-03 13:23:59 +04:00
cudaoptflow Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-17 15:24:05 +04:00
cudastereo Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cudawarping Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
cudev fix bug #3678 (cuda::integral failures) 2014-05-14 12:48:12 +04:00
features2d KAZE: disable tests (too many crashes) 2014-05-29 23:12:48 +04:00
flann Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
highgui Merge pull request #1552 from Exocoder:gtk3 2014-06-04 12:07:17 +04:00
imgproc Merge pull request #2785 from akarsakov:ocl_pyrDown_borders 2014-06-06 18:53:14 +04:00
java Add AKAZE support for the Java wrapper 2014-06-03 18:41:58 +09:00
legacy Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-26 12:32:14 +04:00
matlab Matlab bindings: CMakeLists.txt: use "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}" as MEX_LIB_DIR only when compiling with MSVC, otherwise, use only "${LIBRARY_OUTPUT_PATH}" 2014-05-03 17:37:48 +02:00
ml Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-06-02 13:43:28 +04:00
nonfree Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
objdetect Merge pull request #2773 from abidrahmank:pycascade 2014-05-29 14:51:45 +04:00
optim cv2cvtest part2 2014-04-09 13:08:51 +04:00
photo cv2cvtest part2 2014-04-09 13:08:51 +04:00
python Fixed pyopencv_to w/FLANN IndexParams in python3. 2014-05-21 15:21:41 -04:00
shape fixed defects from Xcode 2014-02-25 17:33:12 +04:00
softcascade deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
stitching optimized stitching warpers 2014-05-15 16:28:34 +04:00
superres Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-24 19:02:16 +04:00
ts Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-06-02 13:43:28 +04:00
video fix according review 2014-05-30 15:44:51 +04:00
videostab Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-17 14:14:07 +04:00
viz Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-14 16:08:02 +04:00
world Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-12 17:38:07 +04:00
CMakeLists.txt
refman.rst.in