third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4f2b126b7b
opencv/modules/core
History
Roman Donchenko 4f2b126b7b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/out.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/generalized_hough.cpp
	modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
..
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-31 14:42:00 +04:00
include/opencv2 OpenCV version++. OpenCV Manager version++. 2014-03-31 15:00:25 -07:00
perf ocl: compare: remove useless perf tests 2014-03-17 12:33:12 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-07 14:59:34 +04:00
test Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage 2014-03-28 12:17:16 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00