Merge pull request #2996 from akarsakov:ocl_dft_new_concept
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Jul 2014 15:59:59 +0000 (15:59 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Jul 2014 15:59:59 +0000 (15:59 +0000)
1  2 
modules/core/src/dxt.cpp

Simple merge