Merge pull request #2527 from apavlenko:ocl_surf_24
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)
commita1d151924ddc3d2a8479e7db416af2d1417a79d4
tree1d39f26aa57787b4dc16752bdbc84c405dc27b77
parenta7f96773782f7f30f3bd86a1e44eecaa1d98fd4e
parentfa5705613da45ab5627b2f9006e355c6dca31afc
Merge pull request #2527 from apavlenko:ocl_surf_24
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf_ocl.cpp