generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2d6f35d6ed
opencv/modules
History
Roman Donchenko 2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +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' into merge-2.4 2013-08-13 12:56:39 +04:00
calib3d War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
contrib Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
core Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
cudev War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
features2d War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
flann War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
gpu Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
gpuarithm Merge commit '43aec5ad^' into merge-2.4 2013-08-27 13:23:26 +04:00
gpubgsegm Merge pull request #1298 from jet47:gpu-eliminate-doubles 2013-08-20 18:04:54 +04:00
gpucodec Merge pull request #1297 from SpecLad:merge-2.4 2013-08-20 14:10:22 +04:00
gpufeatures2d eliminate unnecessary double arithmetics in CUDA 2013-08-19 15:56:45 +04:00
gpufilters added cvconfig.hpp header file to gpu tests 2013-08-19 12:46:57 +04:00
gpuimgproc eliminate unnecessary double arithmetics in CUDA 2013-08-19 15:56:45 +04:00
gpulegacy added cvconfig.hpp header file to gpu tests 2013-08-19 12:46:57 +04:00
gpuoptflow Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
gpustereo added cvconfig.hpp header file to gpu tests 2013-08-19 12:46:57 +04:00
gpuwarping Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
highgui Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
imgproc War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
java Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
legacy Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ml War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
nonfree War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
objdetect War on Whitespace, master edition: tabs. 2013-08-27 17:13:53 +04:00
ocl Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
optim War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +04:00
photo War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
python Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
softcascade War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
stitching War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
superres Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ts Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
video War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
videostab War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04: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 Made reference manual table of contents autogenerated 2012-05-30 14:06:47 +00:00