generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
464a010f53
opencv/samples
History
Roman Donchenko 464a010f53 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/operations.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/src/color.cpp
	modules/features2d/src/orb.cpp
	modules/imgproc/src/samplers.cpp
	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
..
android Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00
c Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00
cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-10 12:51:00 +04:00
gpu Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
java Normalized file endings. 2013-08-21 18:59:25 +04:00
MacOSX/FaceTracker Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
ocl Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-10 12:51:00 +04:00
python2 mouse_and_match.py missing import cv2 2013-11-24 15:58:13 +01:00
winrt Filter selection and several filters implemented for WinRT sample. 2013-11-29 09:47:25 +04:00
CMakeLists.txt cmake: revert CRT linkage option for MSVS 2013-10-09 17:49:11 +04:00