generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,159 Commits 3 Branches 47 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
Roman Donchenko
feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
 2013-07-16 11:52:41 +04:00
yao
8d8dc29ced add kmeans 2013-07-03 13:13:04 +08:00