third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fee2ed37fc
opencv/modules
History
Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
..
androidcamera
bioinspired Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
calib3d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
contrib Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
core Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
cuda Merge commit '05b9c991dd' into merge-2.4 2013-12-30 17:30:59 +04:00
cudaarithm Merge commit '05b9c991dd' into merge-2.4 2013-12-30 17:30:59 +04:00
cudabgsegm
cudacodec
cudafeatures2d
cudafilters
cudaimgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
cudalegacy
cudaoptflow Merge commit '05b9c991dd' into merge-2.4 2013-12-30 17:30:59 +04:00
cudastereo
cudawarping
cudev
features2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
flann Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
highgui Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
java Merge commit '83cdd43a' into merge-2.4 2013-12-30 16:36:35 +04:00
legacy Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
matlab
ml Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
nonfree Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
objdetect Fix compiler error with Android NDK r8e 2014-01-09 14:49:20 +08:00
ocl Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
optim
photo fixed warnings 2013-12-07 01:05:07 +04:00
python Merge commit '4b885e206' into merge-2.4 2013-12-30 16:48:45 +04:00
shape
softcascade
stitching updated docs according to the last changes 2014-01-10 18:19:26 +04:00
superres Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
ts Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
video Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
videostab Code review fixes. 2013-12-23 11:34:46 +04:00
viz fixed -Wshadow and other warnings, added rvec test 2013-12-07 20:33:50 +04:00
world
CMakeLists.txt
refman.rst.in