Merge branch 'work'

6620c5c9 · Marina Kolpakova · 18918a5e · 6620c5c9
Commit 6620c5c9 authored Jun 19, 2012 by Marina Kolpakova
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

warp_reduce.hpp modules/gpu/src/opencv2/gpu/device/warp_reduce.hpp +0 -0

No files found.
--- a/modules/gpu/src/opencv2/gpu/device/warp_reduce.hpp
+++ b/modules/gpu/src/opencv2/gpu/device/warp_reduce.hpp