Merge pull request #3600 from jet47:cuda-objdetect-module
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 20 Jan 2015 13:29:32 +0000 (13:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 20 Jan 2015 13:29:32 +0000 (13:29 +0000)
1  2 
modules/cudaobjdetect/src/cascadeclassifier.cpp
samples/gpu/hog.cpp

Simple merge