generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
f773cd9a3e
opencv/modules/viz
History
Roman Donchenko 799d2dabd6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/test/test_arithm.cpp
	modules/cuda/src/cascadeclassifier.cpp
	modules/imgproc/doc/geometric_transformations.rst
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/moments.cpp
2014-04-14 16:08:02 +04:00
..
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-14 16:08:02 +04:00
include/opencv2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-14 16:08:02 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-14 16:08:02 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-14 16:08:02 +04:00
CMakeLists.txt minor cmake fix fo macos 2014-03-12 16:22:22 +04:00