projects / profile / ivi / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bbae054 b636569)
Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 21 Mar 2013 16:59:18 +0000 (20:59 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 21 Mar 2013 19:11:54 +0000 (23:11 +0400)
commit1ca8f33b4e89b5ef065c27312c48c8849d675d69
treeb6c751350ac4286139d1d04679505c638a55ac18tree | snapshot
parentbbae05413d734233dbde290b185857b4cd58828bcommit | diff
parentb6365699ee023e80ffd7739ed820d23aaed1e0e5commit | diff
Merge branch '2.4'
74 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
cmake/OpenCVModule.cmake diff1 | diff2 | blob | history
modules/calib3d/src/stereobm.cpp diff1 | diff2 | blob | history
modules/core/src/lapack.cpp diff1 | diff2 | blob | history
modules/core/test/test_math.cpp diff1 | diff2 | blob | history
modules/gpu/CMakeLists.txt diff1 | diff2 | blob | history
modules/gpu/doc/feature_detection_and_description.rst diff1 | diff2 | blob | history
modules/gpu/include/opencv2/gpu.hpp diff1 | | blob | history
modules/gpu/include/opencv2/gpu/gpu.hpp diff1 | diff2 | blob | history
modules/gpu/perf/perf_precomp.hpp diff1 | diff2 | blob | history
modules/gpu/perf4au/main.cpp diff1 | diff2 | blob | history
modules/gpu/src/arithm.cpp diff1 | diff2 | blob | history
modules/gpu/test/main.cpp diff1 | diff2 | blob | history
modules/gpu/test/test_precomp.hpp diff1 | diff2 | blob | history
modules/imgproc/include/opencv2/imgproc/imgproc.hpp diff1 | diff2 | blob | history
modules/java/generator/rst_parser.py diff1 | diff2 | blob | history
modules/ml/include/opencv2/ml.hpp diff1 | | blob | history
modules/ml/src/svm.cpp diff1 | diff2 | blob | history
modules/nonfree/include/opencv2/nonfree/gpu.hpp | diff2 | blob | history
modules/nonfree/include/opencv2/nonfree/ocl.hpp | diff2 | blob | history
modules/nonfree/perf/perf_precomp.hpp diff1 | diff2 | blob | history
modules/nonfree/src/precomp.hpp diff1 | diff2 | blob | history
modules/nonfree/src/surf.ocl.cpp diff1 | diff2 | blob | history
modules/nonfree/src/surf_gpu.cpp diff1 | diff2 | blob | history
modules/nonfree/test/test_precomp.hpp diff1 | diff2 | blob | history
modules/ocl/include/opencv2/ocl.hpp diff1 | | blob | history
modules/ocl/include/opencv2/ocl/ocl.hpp diff1 | diff2 | blob | history
modules/ocl/include/opencv2/ocl/private/util.hpp | diff2 | blob | history
modules/ocl/src/arithm.cpp diff1 | diff2 | blob | history
modules/ocl/src/canny.cpp diff1 | diff2 | blob | history
modules/ocl/src/fft.cpp diff1 | diff2 | blob | history
modules/ocl/src/filtering.cpp diff1 | diff2 | blob | history
modules/ocl/src/haar.cpp diff1 | diff2 | blob | history
modules/ocl/src/hog.cpp diff1 | diff2 | blob | history
modules/ocl/src/hough.cpp diff1 | | blob | history
modules/ocl/src/imgproc.cpp diff1 | diff2 | blob | history
modules/ocl/src/initialization.cpp diff1 | diff2 | blob | history
modules/ocl/src/interpolate_frames.cpp diff1 | diff2 | blob | history
modules/ocl/src/matrix_operations.cpp diff1 | diff2 | blob | history
modules/ocl/src/mcwutil.cpp diff1 | diff2 | blob | history
modules/ocl/src/moments.cpp diff1 | diff2 | blob | history
modules/ocl/src/opencl/imgproc_hough.cl diff1 | | blob | history
modules/ocl/src/opencl/moments.cl diff1 | diff2 | blob | history
modules/ocl/src/precomp.hpp diff1 | diff2 | blob | history
modules/ocl/src/pyrlk.cpp diff1 | diff2 | blob | history
modules/ocl/src/split_merge.cpp diff1 | diff2 | blob | history
modules/ocl/src/stereobm.cpp | diff2 | blob | history
modules/ocl/test/precomp.hpp diff1 | diff2 | blob | history
modules/ocl/test/test_calib3d.cpp diff1 | diff2 | blob | history
modules/stitching/include/opencv2/stitching/detail/matchers.hpp diff1 | diff2 | blob | history
modules/stitching/src/matchers.cpp diff1 | diff2 | blob | history
modules/stitching/src/precomp.hpp diff1 | diff2 | blob | history
modules/stitching/src/stitcher.cpp diff1 | diff2 | blob | history
modules/superres/include/opencv2/superres.hpp | diff2 | blob | history
modules/superres/include/opencv2/superres/optical_flow.hpp | diff2 | blob | history
modules/superres/perf/perf_precomp.hpp | diff2 | blob | history
modules/superres/src/btv_l1.cpp | diff2 | blob | history
modules/superres/src/btv_l1_gpu.cpp | diff2 | blob | history
modules/superres/src/frame_source.cpp | diff2 | blob | history
modules/superres/src/input_array_utility.cpp | diff2 | blob | history
modules/superres/src/input_array_utility.hpp | diff2 | blob | history
modules/superres/src/optical_flow.cpp | diff2 | blob | history
modules/superres/src/precomp.hpp | diff2 | blob | history
modules/superres/src/super_resolution.cpp | diff2 | blob | history
modules/superres/test/test_precomp.hpp | diff2 | blob | history
modules/ts/include/opencv2/ts/gpu_perf.hpp | diff2 | blob | history
modules/ts/include/opencv2/ts/gpu_test.hpp | diff2 | blob | history
modules/ts/src/gpu_perf.cpp | diff2 | blob | history
samples/cpp/CMakeLists.txt diff1 | diff2 | blob | history
samples/cpp/stitching_detailed.cpp diff1 | diff2 | blob | history
samples/gpu/CMakeLists.txt diff1 | diff2 | blob | history
samples/gpu/bgfg_segm.cpp diff1 | diff2 | blob | history
samples/gpu/super_resolution.cpp | diff2 | blob | history
samples/ocl/performance.cpp diff1 | diff2 | blob | history
Domain: Multimedia / Uncategorized;