Merge pull request #1954 from pentschev:ocl_features2d_fast_master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 12 Dec 2013 13:37:09 +0000 (17:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Dec 2013 13:37:09 +0000 (17:37 +0400)
1  2 
modules/ocl/include/opencv2/ocl.hpp

Simple merge