peng xiao 3fea2620e6 Fix some compilation errors and warnings.		2013-04-08 16:22:20 +08:00
..
doc	Merge branch '2.4'	2013-03-21 23:11:54 +04:00
include/opencv2	ocl: Add dft based convolve implementation.	2013-04-08 15:19:44 +08:00
perf	Merge branch '2.4'	2013-04-05 21:11:59 +04:00
src	Fix some compilation errors and warnings.	2013-04-08 16:22:20 +08:00
test	Fix some compilation errors and warnings.	2013-04-08 16:22:20 +08:00
CMakeLists.txt	Merge branch '2.4'	2013-04-05 21:11:59 +04:00