Merge commit 'b51a1a7d' (PR #895 from 2.4)
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 22 May 2013 13:21:19 +0000 (17:21 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Wed, 22 May 2013 14:28:28 +0000 (18:28 +0400)
commit5e0e1fac877d04c3a63dd7c4ada470c86e61a52b
tree344d39d14cc18065e599e0fc2480555152657a43
parent61567adc5dc7b0101112e5b57b6e8feaeb525d50
parentb51a1a7d15d7220644cabf5913368c21b5e62f71
Merge commit 'b51a1a7d' (PR #895 from 2.4)

Conflicts:
modules/ocl/CMakeLists.txt
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_hough.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp