Merge branch 'work'
authorMarina Kolpakova <no@email>
Tue, 19 Jun 2012 13:41:15 +0000 (13:41 +0000)
committerMarina Kolpakova <no@email>
Tue, 19 Jun 2012 13:41:15 +0000 (13:41 +0000)
commit6620c5c92da822c267f21ef3410438bc29ee9ad9
tree024b062b58dc9c53d27073736727c074f170503a
parent18918a5e44677caead6dee9232a4d5027026e226
Merge branch 'work'
modules/gpu/src/opencv2/gpu/device/warp_reduce.hpp