generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5ac3b8d5d8
opencv/modules/nonfree
History
Roman Donchenko 5ac3b8d5d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Pull requests:
	#904 from ograycode:2.4
	#905 from bitwangyaoyao:2.4_TVL1
	#902 from apavlenko:fix_run_py
	#882 from pengx17:2.4_rewrite_query_info

Conflicts:
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/tvl1flow.cpp
2013-05-27 16:58:04 +04:00
..
doc removed VIBE implementation 2013-05-17 11:27:00 +04:00
include/opencv2 removed VIBE implementation 2013-05-17 11:27:00 +04:00
perf removed VIBE implementation 2013-05-17 11:27:00 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-05-27 16:58:04 +04:00
test removed VIBE implementation 2013-05-17 11:27:00 +04:00
CMakeLists.txt Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00