Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft
authorpeng xiao <hisenxpress@gmail.com>
Wed, 29 May 2013 09:57:14 +0000 (17:57 +0800)
committerpeng xiao <hisenxpress@gmail.com>
Wed, 29 May 2013 09:57:14 +0000 (17:57 +0800)
commit006e4242b2f95ca8d124a32e07c16c4e51827728
tree5fdceae68285847805c1d9e39fde76ab972d0606
parentb4a4a05bdc7bcf220b132b5ab5fc9fb47b4e11ec
parent2ccdf561197b74fd3855d875adb0751334a22b92
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/mcwutil.cpp