Merge pull request #2527 from apavlenko:ocl_surf_24

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)
diff --cc modules/nonfree/perf/perf_main.cpp
Simple merge
diff --cc modules/nonfree/perf/perf_surf_ocl.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)
		1	2
modules/nonfree/perf/perf_main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/nonfree/perf/perf_surf_ocl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history