Merge branch master into cuda-dev
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 10 Dec 2012 21:12:14 +0000 (01:12 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 10 Dec 2012 21:12:14 +0000 (01:12 +0400)
commita6c3ed5b36d70808409473ed42be12568f4ed0ee
tree90ca7279afc6efe813de6a21d4747d9b9afd6ad3
parent50946b59c14a81b52a6530d421a88dc6b1307e8c
parent67ce03d7dd7d2efd53c57fc6fb4c12b4509fe2dc
Merge branch master into cuda-dev
modules/gpu/include/opencv2/gpu/device/utility.hpp
modules/gpu/src/cuda/integral_image.cu
modules/gpu/src/cuda/surf.cu
modules/gpu/src/imgproc.cpp
modules/gpu/src/surf.cpp
modules/gpu/test/test_video.cpp
modules/highgui/src/precomp.hpp