generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9c2272d520
opencv/samples
History
Roman Donchenko 9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +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-11-26 15:05:26 +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 another attempt to fix compile errors 2013-11-18 22:15:04 -05:00
python2 mouse_and_match.py missing import cv2 2013-11-24 15:58:13 +01:00
winrt/ImageManipulations Removed incorrect iCCP chunks from GUI resources. 2013-08-30 09:49:24 -04:00
CMakeLists.txt cmake: revert CRT linkage option for MSVS 2013-10-09 17:49:11 +04:00